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
parent 27ffb29908 efc972799d
commit 322cb1922e
7 changed files with 26 additions and 26 deletions
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
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_KHX_device_group"
SourceExtension "GL_EXT_device_group"
Name 4 "main"
Name 9 "color"
Name 12 "gl_DeviceIndexKHR"
Decorate 12(gl_DeviceIndexKHR) BuiltIn DeviceIndex
Name 12 "gl_DeviceIndex"
Decorate 12(gl_DeviceIndex) BuiltIn DeviceIndex
2: TypeVoid
3: TypeFunction 2
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
10: TypeInt 32 1
11: TypePointer UniformConstant 10(int)
12(gl_DeviceIndexKHR): 11(ptr) Variable UniformConstant
12(gl_DeviceIndex): 11(ptr) Variable UniformConstant
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
13: 10(int) Load 12(gl_DeviceIndexKHR)
13: 10(int) Load 12(gl_DeviceIndex)
14: 6(float) ConvertSToF 13
16: 7(fvec4) CompositeConstruct 14 15 15 15
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
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_KHX_multiview"
SourceExtension "GL_EXT_multiview"
Name 4 "main"
Name 9 "color"
Name 12 "gl_ViewIndexKHR"
Decorate 12(gl_ViewIndexKHR) BuiltIn ViewIndex
Name 12 "gl_ViewIndex"
Decorate 12(gl_ViewIndex) BuiltIn ViewIndex
2: TypeVoid
3: TypeFunction 2
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
10: TypeInt 32 1
11: TypePointer UniformConstant 10(int)
12(gl_ViewIndexKHR): 11(ptr) Variable UniformConstant
12(gl_ViewIndex): 11(ptr) Variable UniformConstant
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
13: 10(int) Load 12(gl_ViewIndexKHR)
13: 10(int) Load 12(gl_ViewIndex)
14: 6(float) ConvertSToF 13
16: 7(fvec4) CompositeConstruct 14 15 15 15
Store 9(color) 16

4
Test/spv.deviceGroup.frag
View File

@@ -1,9 +1,9 @@
#version 450
#extension GL_KHX_device_group : enable
#extension GL_EXT_device_group : enable
out vec4 color;
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
#extension GL_KHX_multiview : enable
#extension GL_EXT_multiview : enable
out vec4 color;
void main() {
color = vec4(gl_ViewIndexKHR, 0, 0, 0);
color = vec4(gl_ViewIndex, 0, 0, 0);
}