From 67486ee516ddc33806003727682cbfc68ab1f726 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 28 May 2021 17:15:12 -0400 Subject: Glslang refactor bugfix (#1863) * #include an absolute path didn't work - because paths were taken to always be relative. * Fix issue with with SLANG_ENABLE_GLSLANG_SUPPORT * Update expected output from glslang-error.glsl * Fix bug in glsl dissassembly. * Make ExtensionTracker available even if source is not emitted. * Only explicitly set extension tracker based on capability bits, if we are in pass through. * Small simplification of invoke sourceEmit. --- source/compiler-core/slang-glslang-compiler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/compiler-core') diff --git a/source/compiler-core/slang-glslang-compiler.cpp b/source/compiler-core/slang-glslang-compiler.cpp index 8a8712024..e754cbdbc 100644 --- a/source/compiler-core/slang-glslang-compiler.cpp +++ b/source/compiler-core/slang-glslang-compiler.cpp @@ -221,7 +221,6 @@ SlangResult GlslangDownstreamCompiler::disassemble(SlangCompileTarget sourceBlob StringBuilder builder; - String output; auto outputFunc = [](void const* data, size_t size, void* userData) { (*(StringBuilder*)userData).append((char const*)data, (char const*)data + size); @@ -239,7 +238,7 @@ SlangResult GlslangDownstreamCompiler::disassemble(SlangCompileTarget sourceBlob request.inputEnd = (char*)blob + blobSize; request.outputFunc = outputFunc; - request.outputUserData = &output; + request.outputUserData = &builder; SLANG_RETURN_ON_FAIL(_invoke(request)); -- cgit v1.2.3