diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-04-08 15:04:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 15:04:01 -0700 |
| commit | 7c82ead1f5a7f866abe4e8fa931f857a505c3077 (patch) | |
| tree | 2cbfabb0a479dbcbb36314ecd6aec33218d4ecbc | |
| parent | dc54f1dd1b694b087816857a791e9d37dc25de6d (diff) | |
Update glslang version (#940)
* Update glslang
This moves to a version of glslang that is hosted with the slang project and that includes a patch for a high-priority fix that hasn't been upstreamed into the main glslang repository yet.
* Change a GLSL extension name
The glslang codebase changed the extension name required to enable certain features from `GL_KHX_shader_explicit_arithmetic_types` to `GL_EXT_shader_explicit_arithmetic_types`.
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | external/glslang | 0 | ||||
| -rw-r--r-- | source/slang/emit.cpp | 3 | ||||
| -rw-r--r-- | tests/compute/half-texture.slang.expected | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 3fb361bd6..0c12afa2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "external/glslang"] path = external/glslang - url = https://github.com/KhronosGroup/glslang.git + url = https://github.com/shader-slang/glslang.git [submodule "external/tinyobjloader"] path = external/tinyobjloader url = https://github.com/syoyo/tinyobjloader diff --git a/external/glslang b/external/glslang -Subproject 4207c97b938078818140edad101a032cf768191 +Subproject cf81aec38043011fbc53464f828cc1ed80c52d4 diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index 1e9970b1a..c17bb3266 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -86,8 +86,7 @@ void requireGLSLHalfExtension(ExtensionUsageTracker* tracker) requireGLSLExtension(tracker, "GL_EXT_shader_16bit_storage"); // https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GL_EXT_shader_explicit_arithmetic_types.txt - // Use GL_KHX_shader_explicit_arithmetic_types because that is what appears defined in glslang - requireGLSLExtension(tracker, "GL_KHX_shader_explicit_arithmetic_types"); + requireGLSLExtension(tracker, "GL_EXT_shader_explicit_arithmetic_types"); tracker->hasHalfExtension = true; } diff --git a/tests/compute/half-texture.slang.expected b/tests/compute/half-texture.slang.expected index dc8d5dcbe..8d1a6bef4 100644 --- a/tests/compute/half-texture.slang.expected +++ b/tests/compute/half-texture.slang.expected @@ -15,8 +15,8 @@ standard output = { ExecutionMode 4 LocalSize 4 4 1 Source GLSL 450 SourceExtension "GL_EXT_shader_16bit_storage" + SourceExtension "GL_EXT_shader_explicit_arithmetic_types" SourceExtension "GL_GOOGLE_cpp_style_line_directive" - SourceExtension "GL_KHX_shader_explicit_arithmetic_types" Name 4 "main" Name 9 "pos_0" Name 13 "gl_GlobalInvocationID" |