diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-09-20 17:49:32 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-09-20 17:49:32 +0000 |
| commit | 1213ea3a22db8694bb7c8e710e062a55edd1f210 (patch) | |
| tree | 052ecf872563eac76d969b66cb00b597f425e510 | |
| parent | added ability to use #include in glsl (diff) | |
| download | DiligentCore-1213ea3a22db8694bb7c8e710e062a55edd1f210.tar.gz DiligentCore-1213ea3a22db8694bb7c8e710e062a55edd1f210.zip | |
Couple of minor fixes
| -rw-r--r-- | Graphics/ShaderTools/src/GLSLangUtils.cpp | 2 | ||||
| -rw-r--r-- | Tests/DiligentCoreAPITest/src/Vulkan/TestingEnvironmentVk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/ShaderTools/src/GLSLangUtils.cpp b/Graphics/ShaderTools/src/GLSLangUtils.cpp index 000af866..7d252f7d 100644 --- a/Graphics/ShaderTools/src/GLSLangUtils.cpp +++ b/Graphics/ShaderTools/src/GLSLangUtils.cpp @@ -423,7 +423,7 @@ public: const char* includerName, size_t inclusionDepth) { - return includeSystem(headerName, includerName, inclusionDepth); + return nullptr; } // Signals that the parser will no longer use the contents of the diff --git a/Tests/DiligentCoreAPITest/src/Vulkan/TestingEnvironmentVk.cpp b/Tests/DiligentCoreAPITest/src/Vulkan/TestingEnvironmentVk.cpp index 256af885..5cea21fc 100644 --- a/Tests/DiligentCoreAPITest/src/Vulkan/TestingEnvironmentVk.cpp +++ b/Tests/DiligentCoreAPITest/src/Vulkan/TestingEnvironmentVk.cpp @@ -319,7 +319,7 @@ VkShaderModule TestingEnvironmentVk::CreateShaderModule(const SHADER_TYPE Shader LOG_ERROR("GLSLang was not built. Shader compilaton is not possible."); return VK_NULL_HANDLE; #else - auto Bytecode = GLSLangUtils::GLSLtoSPIRV(ShaderType, ShaderSource.c_str(), static_cast<int>(ShaderSource.length()), nullptr); + auto Bytecode = GLSLangUtils::GLSLtoSPIRV(ShaderType, ShaderSource.c_str(), static_cast<int>(ShaderSource.length()), nullptr, nullptr); VERIFY_EXPR(!Bytecode.empty()); if (Bytecode.empty()) return VK_NULL_HANDLE; |