diff options
| author | DiligentGraphics <admin@diligentgraphics.com> | 2019-02-27 15:20:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 15:20:14 +0000 |
| commit | 1481f573e6ef1eab0a2a543edd0a8fd794df94a6 (patch) | |
| tree | 384bfebdd155d920f24f70a3717e6722282383db /Graphics/GLSLTools | |
| parent | Fixed typo in LayoutElement structure (diff) | |
| parent | Added surface definition and find_library for android case (diff) | |
| download | DiligentCore-1481f573e6ef1eab0a2a543edd0a8fd794df94a6.tar.gz DiligentCore-1481f573e6ef1eab0a2a543edd0a8fd794df94a6.zip | |
Merge pull request #67 from StarshipVendingMachine/android-vulkan
Android vulkan
Diffstat (limited to 'Graphics/GLSLTools')
| -rw-r--r-- | Graphics/GLSLTools/src/SPIRVUtils.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Graphics/GLSLTools/src/SPIRVUtils.cpp b/Graphics/GLSLTools/src/SPIRVUtils.cpp index 9f9a7d88..799270db 100644 --- a/Graphics/GLSLTools/src/SPIRVUtils.cpp +++ b/Graphics/GLSLTools/src/SPIRVUtils.cpp @@ -26,16 +26,7 @@ #include <memory> #include <array> -#if PLATFORM_ANDROID - // Android specific include files. -# include <unordered_map> - - // Header files. -# include <android_native_app_glue.h> -# include "shaderc/shaderc.hpp" - // Static variable that keeps ANativeWindow and asset manager instances. - //static android_app *Android_application = nullptr; -#elif (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK)) +#if (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK)) # include <MoltenGLSLToSPIRVConverter/GLSLToSPIRVConverter.h> #else # include "SPIRV/GlslangToSpv.h" @@ -56,16 +47,12 @@ namespace Diligent void InitializeGlslang() { -#if !PLATFORM_ANDROID glslang::InitializeProcess(); -#endif } void FinalizeGlslang() { -#if !PLATFORM_ANDROID glslang::FinalizeProcess(); -#endif } EShLanguage ShaderTypeToShLanguage(SHADER_TYPE ShaderType) |