Skip to content

Commit 7c82ead

Browse files
author
Tim Foley
authoredApr 8, 2019
Update glslang version (shader-slang#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`.
1 parent dc54f1d commit 7c82ead

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed
 

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "external/glslang"]
22
path = external/glslang
3-
url = https://github.com/KhronosGroup/glslang.git
3+
url = https://github.com/shader-slang/glslang.git
44
[submodule "external/tinyobjloader"]
55
path = external/tinyobjloader
66
url = https://github.com/syoyo/tinyobjloader

‎external/glslang

Submodule glslang updated 591 files

‎source/slang/emit.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ void requireGLSLHalfExtension(ExtensionUsageTracker* tracker)
8686
requireGLSLExtension(tracker, "GL_EXT_shader_16bit_storage");
8787

8888
// https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GL_EXT_shader_explicit_arithmetic_types.txt
89-
// Use GL_KHX_shader_explicit_arithmetic_types because that is what appears defined in glslang
90-
requireGLSLExtension(tracker, "GL_KHX_shader_explicit_arithmetic_types");
89+
requireGLSLExtension(tracker, "GL_EXT_shader_explicit_arithmetic_types");
9190

9291
tracker->hasHalfExtension = true;
9392
}

‎tests/compute/half-texture.slang.expected

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ standard output = {
1515
ExecutionMode 4 LocalSize 4 4 1
1616
Source GLSL 450
1717
SourceExtension "GL_EXT_shader_16bit_storage"
18+
SourceExtension "GL_EXT_shader_explicit_arithmetic_types"
1819
SourceExtension "GL_GOOGLE_cpp_style_line_directive"
19-
SourceExtension "GL_KHX_shader_explicit_arithmetic_types"
2020
Name 4 "main"
2121
Name 9 "pos_0"
2222
Name 13 "gl_GlobalInvocationID"

0 commit comments

Comments
 (0)
Please sign in to comment.