From 7a44a31dee9ff0b65cda876c87e508ff87bc3503 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Mon, 13 Mar 2017 15:43:26 -0600
Subject: [PATCH] SPV: Address #759: make ViewIndex and DeviceIndex by 'in',
not 'uniform'.
---
Test/baseResults/spv.deviceGroup.frag.out | 6 +++---
Test/baseResults/spv.multiView.frag.out | 6 +++---
glslang/Include/revision.h | 4 ++--
glslang/MachineIndependent/Initialize.cpp | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Test/baseResults/spv.deviceGroup.frag.out b/Test/baseResults/spv.deviceGroup.frag.out
index 9c2344361..e8a699205 100755
--- a/Test/baseResults/spv.deviceGroup.frag.out
+++ b/Test/baseResults/spv.deviceGroup.frag.out
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_device_group"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Fragment 4 "main" 9
+ EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
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)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
- 11: TypePointer UniformConstant 10(int)
-12(gl_DeviceIndex): 11(ptr) Variable UniformConstant
+ 11: TypePointer Input 10(int)
+12(gl_DeviceIndex): 11(ptr) Variable Input
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
diff --git a/Test/baseResults/spv.multiView.frag.out b/Test/baseResults/spv.multiView.frag.out
index 957161727..8ec97b087 100755
--- a/Test/baseResults/spv.multiView.frag.out
+++ b/Test/baseResults/spv.multiView.frag.out
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_multiview"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Fragment 4 "main" 9
+ EntryPoint Fragment 4 "main" 9 12
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
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)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
- 11: TypePointer UniformConstant 10(int)
-12(gl_ViewIndex): 11(ptr) Variable UniformConstant
+ 11: TypePointer Input 10(int)
+12(gl_ViewIndex): 11(ptr) Variable Input
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 45eb6f70b..9e6ffb24a 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
// 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).
-#define GLSLANG_REVISION "Overload400-PrecQual.1902"
-#define GLSLANG_DATE "11-Mar-2017"
+#define GLSLANG_REVISION "Overload400-PrecQual.1906"
+#define GLSLANG_DATE "13-Mar-2017"
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 60cff6012..e904cf820 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -3702,8 +3702,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
}
if (profile != EEsProfile) {
- commonBuiltins.append("uniform int gl_ViewIndex;");
- commonBuiltins.append("uniform int gl_DeviceIndex;"); // GL_EXT_device_group
+ commonBuiltins.append("in int gl_ViewIndex;");
+ commonBuiltins.append("in int gl_DeviceIndex;"); // GL_EXT_device_group
}
// printf("%s\n", commonBuiltins.c_str());
--
GitLab