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. --- tests/cross-compile/glslang-error.glsl.expected | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/cross-compile/glslang-error.glsl.expected b/tests/cross-compile/glslang-error.glsl.expected index 9a11a6967..e15d5c3eb 100644 --- a/tests/cross-compile/glslang-error.glsl.expected +++ b/tests/cross-compile/glslang-error.glsl.expected @@ -1,8 +1,7 @@ result code = -1 standard error = { -glslang: ERROR: tests/cross-compile/glslang-error.glsl:6: '' : syntax error, unexpected SEMICOLON -ERROR: 1 compilation errors. No code generated. - +glslang: tests/cross-compile/glslang-error.glsl(6): error : '' : syntax error, unexpected SEMICOLON +glslang: note : ERROR: 1 compilation errors. No code generated. } standard output = { } -- cgit v1.2.3