summaryrefslogtreecommitdiffstats
path: root/source/compiler-core
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-05-28 17:15:12 -0400
committerGitHub <noreply@github.com>2021-05-28 14:15:12 -0700
commit67486ee516ddc33806003727682cbfc68ab1f726 (patch)
tree21e44c4a01cae2bfa03de9ed35efe45f0ce1ac66 /source/compiler-core
parent89faa8a7d9b441b5dd92eec5fcf362eb3f38fa2b (diff)
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.
Diffstat (limited to 'source/compiler-core')
-rw-r--r--source/compiler-core/slang-glslang-compiler.cpp3
1 files changed, 1 insertions, 2 deletions
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));