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

SPV: Address #759: make ViewIndex and DeviceIndex by 'in', not 'uniform'.

Browse Source
This commit is contained in:
John Kessenich
2017-03-13 15:43:26 -06:00
parent 946e0a6d8c
commit 7a44a31dee
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_device_group" Extension "SPV_KHR_device_group"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9 EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source GLSL 450 Source GLSL 450
SourceExtension "GL_EXT_device_group" SourceExtension "GL_EXT_device_group"
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4) 8: TypePointer Output 7(fvec4)
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 Input 10(int)
12(gl_DeviceIndex): 11(ptr) Variable UniformConstant 12(gl_DeviceIndex): 11(ptr) Variable Input
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

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

@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_multiview" Extension "SPV_KHR_multiview"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9 EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source GLSL 450 Source GLSL 450
SourceExtension "GL_EXT_multiview" SourceExtension "GL_EXT_multiview"
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4) 8: TypePointer Output 7(fvec4)
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 Input 10(int)
12(gl_ViewIndex): 11(ptr) Variable UniformConstant 12(gl_ViewIndex): 11(ptr) Variable Input
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

4
glslang/Include/revision.h
View File

@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1902" #define GLSLANG_REVISION "Overload400-PrecQual.1906"
#define GLSLANG_DATE "11-Mar-2017" #define GLSLANG_DATE "13-Mar-2017"

4
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_ViewIndex;"); commonBuiltins.append("in int gl_ViewIndex;");
commonBuiltins.append("uniform int gl_DeviceIndex;"); // GL_EXT_device_group commonBuiltins.append("in int gl_DeviceIndex;"); // GL_EXT_device_group
} }
// printf("%s\n", commonBuiltins.c_str()); // printf("%s\n", commonBuiltins.c_str());