Add missing gl_MaxGeometryTextureImageUnits.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28439 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/Test/150.geom b/Test/150.geom
index 8f13a60..f76c650 100644 (file)
--- a/Test/150.geom
+++ b/Test/150.geom
@@ -103,3 +103,23 @@ out sameName {
 uniform sameName {\r
     bool b15;\r
 };\r
+\r
+float summ = gl_MaxVertexAttribs +\r
+             gl_MaxVertexUniformComponents +\r
+             gl_MaxVaryingFloats +\r
+             gl_MaxVaryingComponents +\r
+             gl_MaxVertexOutputComponents  +\r
+             gl_MaxGeometryInputComponents  +\r
+             gl_MaxGeometryOutputComponents  +\r
+             gl_MaxFragmentInputComponents  +\r
+             gl_MaxVertexTextureImageUnits +\r
+             gl_MaxCombinedTextureImageUnits +\r
+             gl_MaxTextureImageUnits +\r
+             gl_MaxFragmentUniformComponents +\r
+             gl_MaxDrawBuffers +\r
+             gl_MaxClipDistances  +\r
+             gl_MaxGeometryTextureImageUnits +\r
+             gl_MaxGeometryOutputVertices +\r
+             gl_MaxGeometryTotalOutputComponents  +\r
+             gl_MaxGeometryUniformComponents  +\r
+             gl_MaxGeometryVaryingComponents;\r

diff --git a/Test/baseResults/150.geom.out b/Test/baseResults/150.geom.out
index 8d04457..b2dc891 100644 (file)
--- a/Test/baseResults/150.geom.out
+++ b/Test/baseResults/150.geom.out
@@ -124,6 +124,11 @@ ERROR: node is still EOpNull!
 0:69          1.000000\r
 0:69          1.000000\r
 0:69          1.000000\r
+0:107  Sequence\r
+0:107    move second child to first child (float)\r
+0:107      'summ' (float)\r
+0:107      Constant:\r
+0:107        11332.000000\r
 0:?   Linker Objects\r
 0:?     'fromV' (in 4-element array of block{in 3-component vector of float color})\r
 0:?     'toF' (layout(stream=0 ) out block{layout(stream=0 ) out 3-component vector of float color})\r
@@ -148,6 +153,7 @@ ERROR: node is still EOpNull!
 0:?     'insn' (in 4-element array of block{in int a15})\r
 0:?     'anon@3' (layout(stream=3 ) out block{layout(stream=3 ) out float f15})\r
 0:?     'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform bool b15})\r
+0:?     'summ' (float)\r
 \r
 \r
 Linked geometry stage:\r
@@ -243,6 +249,11 @@ ERROR: node is still EOpNull!
 0:69          1.000000\r
 0:69          1.000000\r
 0:69          1.000000\r
+0:107  Sequence\r
+0:107    move second child to first child (float)\r
+0:107      'summ' (float)\r
+0:107      Constant:\r
+0:107        11332.000000\r
 0:?   Linker Objects\r
 0:?     'fromV' (in 4-element array of block{in 3-component vector of float color})\r
 0:?     'toF' (layout(stream=0 ) out block{layout(stream=0 ) out 3-component vector of float color})\r
@@ -267,4 +278,5 @@ ERROR: node is still EOpNull!
 0:?     'insn' (in 4-element array of block{in int a15})\r
 0:?     'anon@3' (layout(stream=3 ) out block{layout(stream=3 ) out float f15})\r
 0:?     'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform bool b15})\r
+0:?     'summ' (float)\r
 \r

diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index 57459ff..d45b8a5 100644 (file)
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -2386,6 +2386,8 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
             s.append(builtInConstant);
             snprintf(builtInConstant, maxSize, "const int gl_MaxGeometryOutputComponents = %d;", resources.maxGeometryOutputComponents);
             s.append(builtInConstant);
+            snprintf(builtInConstant, maxSize, "const int gl_MaxGeometryTextureImageUnits = %d;", resources.maxGeometryTextureImageUnits);
+            s.append(builtInConstant);
             snprintf(builtInConstant, maxSize, "const int gl_MaxGeometryOutputVertices = %d;", resources.maxGeometryOutputVertices);
             s.append(builtInConstant);
             snprintf(builtInConstant, maxSize, "const int gl_MaxGeometryTotalOutputComponents = %d;", resources.maxGeometryTotalOutputComponents);