mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #750 from dgkoch/rename_KHX_to_EXT

Browse Source 
Rename KHX_multiview/device_group to EXT_multiview/device to match the released specs
This commit is contained in:
John Kessenich 2017-03-03 17:23:53 -07:00 committed by GitHub
commit 322cb1922e
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Test/baseResults/spv.deviceGroup.frag.out
View File

@ -13,11 +13,11 @@ Warning, version 450 is not yet complete; most version-specific features are pre
EntryPoint Fragment 4 "main" 9 EntryPoint Fragment 4 "main" 9
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source GLSL 450 Source GLSL 450
SourceExtension "GL_KHX_device_group" SourceExtension "GL_EXT_device_group"
Name 4 "main" Name 4 "main"
Name 9 "color" Name 9 "color"
Name 12 "gl_DeviceIndexKHR" Name 12 "gl_DeviceIndex"
Decorate 12(gl_DeviceIndexKHR) BuiltIn DeviceIndex Decorate 12(gl_DeviceIndex) BuiltIn DeviceIndex
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
@ -26,11 +26,11 @@ Warning, version 450 is not yet complete; most version-specific features are pre
9(color): 8(ptr) Variable Output 9(color): 8(ptr) Variable Output
10: TypeInt 32 1 10: TypeInt 32 1
11: TypePointer UniformConstant 10(int) 11: TypePointer UniformConstant 10(int)
12(gl_DeviceIndexKHR): 11(ptr) Variable UniformConstant 12(gl_DeviceIndex): 11(ptr) Variable UniformConstant
15: 6(float) Constant 0 15: 6(float) Constant 0
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
13: 10(int) Load 12(gl_DeviceIndexKHR) 13: 10(int) Load 12(gl_DeviceIndex)
14: 6(float) ConvertSToF 13 14: 6(float) ConvertSToF 13
16: 7(fvec4) CompositeConstruct 14 15 15 15 16: 7(fvec4) CompositeConstruct 14 15 15 15
Store 9(color) 16 Store 9(color) 16

10
Test/baseResults/spv.multiView.frag.out
View File

@ -13,11 +13,11 @@ Warning, version 450 is not yet complete; most version-specific features are pre
EntryPoint Fragment 4 "main" 9 EntryPoint Fragment 4 "main" 9
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source GLSL 450 Source GLSL 450
SourceExtension "GL_KHX_multiview" SourceExtension "GL_EXT_multiview"
Name 4 "main" Name 4 "main"
Name 9 "color" Name 9 "color"
Name 12 "gl_ViewIndexKHR" Name 12 "gl_ViewIndex"
Decorate 12(gl_ViewIndexKHR) BuiltIn ViewIndex Decorate 12(gl_ViewIndex) BuiltIn ViewIndex
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
@ -26,11 +26,11 @@ Warning, version 450 is not yet complete; most version-specific features are pre
9(color): 8(ptr) Variable Output 9(color): 8(ptr) Variable Output
10: TypeInt 32 1 10: TypeInt 32 1
11: TypePointer UniformConstant 10(int) 11: TypePointer UniformConstant 10(int)
12(gl_ViewIndexKHR): 11(ptr) Variable UniformConstant 12(gl_ViewIndex): 11(ptr) Variable UniformConstant
15: 6(float) Constant 0 15: 6(float) Constant 0
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
13: 10(int) Load 12(gl_ViewIndexKHR) 13: 10(int) Load 12(gl_ViewIndex)
14: 6(float) ConvertSToF 13 14: 6(float) ConvertSToF 13
16: 7(fvec4) CompositeConstruct 14 15 15 15 16: 7(fvec4) CompositeConstruct 14 15 15 15
Store 9(color) 16 Store 9(color) 16

4
Test/spv.deviceGroup.frag
View File

@ -1,9 +1,9 @@
#version 450 #version 450
#extension GL_KHX_device_group : enable #extension GL_EXT_device_group : enable
out vec4 color; out vec4 color;
void main() { void main() {
color = vec4(gl_DeviceIndexKHR, 0, 0, 0); color = vec4(gl_DeviceIndex, 0, 0, 0);
} }

4
Test/spv.multiView.frag
View File

@ -1,9 +1,9 @@
#version 450 #version 450
#extension GL_KHX_multiview : enable #extension GL_EXT_multiview : enable
out vec4 color; out vec4 color;
void main() { void main() {
color = vec4(gl_ViewIndexKHR, 0, 0, 0); color = vec4(gl_ViewIndex, 0, 0, 0);
} }

12
glslang/MachineIndependent/Initialize.cpp
View File

@ -3702,8 +3702,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
} }
if (profile != EEsProfile) { if (profile != EEsProfile) {
commonBuiltins.append("uniform int gl_ViewIndexKHR;"); commonBuiltins.append("uniform int gl_ViewIndex;");
commonBuiltins.append("uniform int gl_DeviceIndexKHR;"); // GL_KHX_device_group commonBuiltins.append("uniform int gl_DeviceIndex;"); // GL_EXT_device_group
} }
// printf("%s\n", commonBuiltins.c_str()); // printf("%s\n", commonBuiltins.c_str());
@ -5318,10 +5318,10 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
} }
if (profile != EEsProfile) { if (profile != EEsProfile) {
symbolTable.setFunctionExtensions("gl_DeviceIndexKHR", 1, &E_GL_KHX_device_group); symbolTable.setFunctionExtensions("gl_DeviceIndex", 1, &E_GL_EXT_device_group);
BuiltInVariable("gl_DeviceIndexKHR", EbvDeviceIndex, symbolTable); BuiltInVariable("gl_DeviceIndex", EbvDeviceIndex, symbolTable);
symbolTable.setFunctionExtensions("gl_ViewIndexKHR", 1, &E_GL_KHX_multiview); symbolTable.setFunctionExtensions("gl_ViewIndex", 1, &E_GL_EXT_multiview);
BuiltInVariable("gl_ViewIndexKHR", EbvViewIndex, symbolTable); BuiltInVariable("gl_ViewIndex", EbvViewIndex, symbolTable);
} }
break; break;

6
glslang/MachineIndependent/Versions.cpp
View File

@ -233,9 +233,9 @@ void TParseVersions::initializeExtensionBehavior()
extensionBehavior[E_GL_OES_texture_buffer] = EBhDisable; extensionBehavior[E_GL_OES_texture_buffer] = EBhDisable;
extensionBehavior[E_GL_OES_texture_cube_map_array] = EBhDisable; extensionBehavior[E_GL_OES_texture_cube_map_array] = EBhDisable;
// KHX extensions // EXT extensions
extensionBehavior[E_GL_KHX_device_group] = EBhDisable; extensionBehavior[E_GL_EXT_device_group] = EBhDisable;
extensionBehavior[E_GL_KHX_multiview] = EBhDisable; extensionBehavior[E_GL_EXT_multiview] = EBhDisable;
} }
// Get code that is not part of a shared symbol table, is specific to this shader, // Get code that is not part of a shared symbol table, is specific to this shader,

6
glslang/MachineIndependent/Versions.h
View File

@ -132,9 +132,9 @@ const char* const E_GL_ARB_sparse_texture_clamp = "GL_ARB_sparse_texture
const char* const E_GL_EXT_shader_non_constant_global_initializers = "GL_EXT_shader_non_constant_global_initializers"; const char* const E_GL_EXT_shader_non_constant_global_initializers = "GL_EXT_shader_non_constant_global_initializers";
const char* const E_GL_EXT_shader_image_load_formatted = "GL_EXT_shader_image_load_formatted"; const char* const E_GL_EXT_shader_image_load_formatted = "GL_EXT_shader_image_load_formatted";
// KHX extensions // EXT extensions
const char* const E_GL_KHX_device_group = "GL_KHX_device_group"; const char* const E_GL_EXT_device_group = "GL_EXT_device_group";
const char* const E_GL_KHX_multiview = "GL_KHX_multiview"; const char* const E_GL_EXT_multiview = "GL_EXT_multiview";
// #line and #include // #line and #include
const char* const E_GL_GOOGLE_cpp_style_line_directive = "GL_GOOGLE_cpp_style_line_directive"; const char* const E_GL_GOOGLE_cpp_style_line_directive = "GL_GOOGLE_cpp_style_line_directive";