Establish desktop completeness through version 1.50. (gl_MaxVaryingFloats, implicit...

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

diff --git a/Test/150.frag b/Test/150.frag
index 6225aa7..de0905c 100644 (file)
--- a/Test/150.frag
+++ b/Test/150.frag
@@ -15,4 +15,31 @@ layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;  // ERROR,
 \r
 in struct S { float f; } s;\r
 \r
-float patch = 3.1;
\ No newline at end of file
+float patch = 3.1;\r
+\r
+uniform sampler2DMS sms;\r
+uniform isampler2DMS isms;\r
+uniform usampler2DMS usms;\r
+uniform sampler2DMSArray smsa;\r
+uniform isampler2DMSArray ismsa;\r
+uniform usampler2DMSArray usmsa;\r
+\r
+flat in ivec2 p2;\r
+flat in ivec3 p3;\r
+flat in int samp;\r
+\r
+void barWxyz()\r
+{\r
+    ivec2 t11 = textureSize( sms);\r
+    ivec2 t12 = textureSize(isms);\r
+    ivec2 t13 = textureSize(usms);\r
+    ivec3 t21 = textureSize( smsa);\r
+    ivec3 t22 = textureSize(ismsa);\r
+    ivec3 t23 = textureSize(usmsa);\r
+     vec4 t31 = texelFetch( sms, p2, samp);\r
+    ivec4 t32 = texelFetch(isms, p2, samp);\r
+    uvec4 t33 = texelFetch(usms, p2, 3);\r
+     vec4 t41 = texelFetch( smsa, p3, samp);\r
+    ivec4 t42 = texelFetch(ismsa, ivec3(2), samp);\r
+    uvec4 t43 = texelFetch(usmsa, p3, samp);\r
+}\r

diff --git a/Test/baseResults/130.frag.out b/Test/baseResults/130.frag.out
index 9e0139e..8e07488 100644 (file)
--- a/Test/baseResults/130.frag.out
+++ b/Test/baseResults/130.frag.out
@@ -247,8 +247,8 @@ ERROR: node is still EOpNull!
 0:111      Sequence\r
 0:111        move second child to first child (4-component vector of int)\r
 0:111          'c' (4-component vector of int)\r
-0:111          Function Call: texture(isA31;vf4;f1; (4-component vector of int)\r
-0:111            'Isca' (uniform isampler3DArray)\r
+0:111          Function Call: texture(isAC1;vf4;f1; (4-component vector of int)\r
+0:111            'Isca' (uniform isamplerCubeArray)\r
 0:111            'i' (smooth in 4-component vector of float)\r
 0:111            Constant:\r
 0:111              0.700000\r
@@ -285,8 +285,8 @@ ERROR: node is still EOpNull!
 0:116                1 (const int)\r
 0:117      move second child to first child (4-component vector of int)\r
 0:117        'c' (4-component vector of int)\r
-0:117        Function Call: textureGrad(isA31;vf4;vf3;vf3; (4-component vector of int)\r
-0:117          'Isca' (uniform isampler3DArray)\r
+0:117        Function Call: textureGrad(isAC1;vf4;vf3;vf3; (4-component vector of int)\r
+0:117          'Isca' (uniform isamplerCubeArray)\r
 0:117          'i' (smooth in 4-component vector of float)\r
 0:117          Constant:\r
 0:117            0.100000\r
@@ -342,7 +342,7 @@ ERROR: node is still EOpNull!
 0:?     'samp2DR' (uniform sampler2DRect)\r
 0:?     'samp2DA' (uniform sampler2DArray)\r
 0:?     'Sca' (uniform samplerCubeArray)\r
-0:?     'Isca' (uniform isampler3DArray)\r
+0:?     'Isca' (uniform isamplerCubeArray)\r
 0:?     'Usca' (uniform usamplerCubeArray)\r
 0:?     'Scas' (uniform samplerCubeArrayShadow)\r
 0:?     'ai' (const 3-element array of int)\r
@@ -580,8 +580,8 @@ ERROR: node is still EOpNull!
 0:111      Sequence\r
 0:111        move second child to first child (4-component vector of int)\r
 0:111          'c' (4-component vector of int)\r
-0:111          Function Call: texture(isA31;vf4;f1; (4-component vector of int)\r
-0:111            'Isca' (uniform isampler3DArray)\r
+0:111          Function Call: texture(isAC1;vf4;f1; (4-component vector of int)\r
+0:111            'Isca' (uniform isamplerCubeArray)\r
 0:111            'i' (smooth in 4-component vector of float)\r
 0:111            Constant:\r
 0:111              0.700000\r
@@ -618,8 +618,8 @@ ERROR: node is still EOpNull!
 0:116                1 (const int)\r
 0:117      move second child to first child (4-component vector of int)\r
 0:117        'c' (4-component vector of int)\r
-0:117        Function Call: textureGrad(isA31;vf4;vf3;vf3; (4-component vector of int)\r
-0:117          'Isca' (uniform isampler3DArray)\r
+0:117        Function Call: textureGrad(isAC1;vf4;vf3;vf3; (4-component vector of int)\r
+0:117          'Isca' (uniform isamplerCubeArray)\r
 0:117          'i' (smooth in 4-component vector of float)\r
 0:117          Constant:\r
 0:117            0.100000\r
@@ -675,7 +675,7 @@ ERROR: node is still EOpNull!
 0:?     'samp2DR' (uniform sampler2DRect)\r
 0:?     'samp2DA' (uniform sampler2DArray)\r
 0:?     'Sca' (uniform samplerCubeArray)\r
-0:?     'Isca' (uniform isampler3DArray)\r
+0:?     'Isca' (uniform isamplerCubeArray)\r
 0:?     'Usca' (uniform usamplerCubeArray)\r
 0:?     'Scas' (uniform samplerCubeArrayShadow)\r
 0:?     'ai' (const 3-element array of int)\r

diff --git a/Test/baseResults/150.frag.out b/Test/baseResults/150.frag.out
index 6795551..5039c0a 100644 (file)
--- a/Test/baseResults/150.frag.out
+++ b/Test/baseResults/150.frag.out
@@ -1,5 +1,4 @@
 150.frag\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 ERROR: 0:4: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord\r
 ERROR: 0:5: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord\r
 ERROR: 0:6: 'layout qualifier' : can only apply origin_upper_left and pixel_center_origin to gl_FragCoord \r
@@ -23,12 +22,100 @@ ERROR: node is still EOpNull!
 0:18      'patch' (float)\r
 0:18      Constant:\r
 0:18        3.100000\r
+0:31  Function Definition: barWxyz( (void)\r
+0:31    Function Parameters: \r
+0:33    Sequence\r
+0:33      Sequence\r
+0:33        move second child to first child (2-component vector of int)\r
+0:33          't11' (2-component vector of int)\r
+0:33          Function Call: textureSize(s21; (2-component vector of int)\r
+0:33            'sms' (uniform sampler2DMS)\r
+0:34      Sequence\r
+0:34        move second child to first child (2-component vector of int)\r
+0:34          't12' (2-component vector of int)\r
+0:34          Function Call: textureSize(is21; (2-component vector of int)\r
+0:34            'isms' (uniform isampler2DMS)\r
+0:35      Sequence\r
+0:35        move second child to first child (2-component vector of int)\r
+0:35          't13' (2-component vector of int)\r
+0:35          Function Call: textureSize(us21; (2-component vector of int)\r
+0:35            'usms' (uniform usampler2DMS)\r
+0:36      Sequence\r
+0:36        move second child to first child (3-component vector of int)\r
+0:36          't21' (3-component vector of int)\r
+0:36          Function Call: textureSize(sA21; (3-component vector of int)\r
+0:36            'smsa' (uniform sampler2DMSArray)\r
+0:37      Sequence\r
+0:37        move second child to first child (3-component vector of int)\r
+0:37          't22' (3-component vector of int)\r
+0:37          Function Call: textureSize(isA21; (3-component vector of int)\r
+0:37            'ismsa' (uniform isampler2DMSArray)\r
+0:38      Sequence\r
+0:38        move second child to first child (3-component vector of int)\r
+0:38          't23' (3-component vector of int)\r
+0:38          Function Call: textureSize(usA21; (3-component vector of int)\r
+0:38            'usmsa' (uniform usampler2DMSArray)\r
+0:39      Sequence\r
+0:39        move second child to first child (4-component vector of float)\r
+0:39          't31' (4-component vector of float)\r
+0:39          Function Call: texelFetch(s21;vi2;i1; (4-component vector of float)\r
+0:39            'sms' (uniform sampler2DMS)\r
+0:39            'p2' (flat in 2-component vector of int)\r
+0:39            'samp' (flat in int)\r
+0:40      Sequence\r
+0:40        move second child to first child (4-component vector of int)\r
+0:40          't32' (4-component vector of int)\r
+0:40          Function Call: texelFetch(is21;vi2;i1; (4-component vector of int)\r
+0:40            'isms' (uniform isampler2DMS)\r
+0:40            'p2' (flat in 2-component vector of int)\r
+0:40            'samp' (flat in int)\r
+0:41      Sequence\r
+0:41        move second child to first child (4-component vector of uint)\r
+0:41          't33' (4-component vector of uint)\r
+0:41          Function Call: texelFetch(us21;vi2;i1; (4-component vector of uint)\r
+0:41            'usms' (uniform usampler2DMS)\r
+0:41            'p2' (flat in 2-component vector of int)\r
+0:41            Constant:\r
+0:41              3 (const int)\r
+0:42      Sequence\r
+0:42        move second child to first child (4-component vector of float)\r
+0:42          't41' (4-component vector of float)\r
+0:42          Function Call: texelFetch(sA21;vi3;i1; (4-component vector of float)\r
+0:42            'smsa' (uniform sampler2DMSArray)\r
+0:42            'p3' (flat in 3-component vector of int)\r
+0:42            'samp' (flat in int)\r
+0:43      Sequence\r
+0:43        move second child to first child (4-component vector of int)\r
+0:43          't42' (4-component vector of int)\r
+0:43          Function Call: texelFetch(isA21;vi3;i1; (4-component vector of int)\r
+0:43            'ismsa' (uniform isampler2DMSArray)\r
+0:43            Constant:\r
+0:43              2 (const int)\r
+0:43              2 (const int)\r
+0:43              2 (const int)\r
+0:43            'samp' (flat in int)\r
+0:44      Sequence\r
+0:44        move second child to first child (4-component vector of uint)\r
+0:44          't43' (4-component vector of uint)\r
+0:44          Function Call: texelFetch(usA21;vi3;i1; (4-component vector of uint)\r
+0:44            'usmsa' (uniform usampler2DMSArray)\r
+0:44            'p3' (flat in 3-component vector of int)\r
+0:44            'samp' (flat in int)\r
 0:?   Linker Objects\r
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)\r
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)\r
 0:?     'foo' (smooth in 4-component vector of float)\r
 0:?     's' (smooth in structure{float f})\r
 0:?     'patch' (float)\r
+0:?     'sms' (uniform sampler2DMS)\r
+0:?     'isms' (uniform isampler2DMS)\r
+0:?     'usms' (uniform usampler2DMS)\r
+0:?     'smsa' (uniform sampler2DMSArray)\r
+0:?     'ismsa' (uniform isampler2DMSArray)\r
+0:?     'usmsa' (uniform usampler2DMSArray)\r
+0:?     'p2' (flat in 2-component vector of int)\r
+0:?     'p3' (flat in 3-component vector of int)\r
+0:?     'samp' (flat in int)\r
 \r
 \r
 Linked fragment stage:\r
@@ -50,10 +137,98 @@ ERROR: node is still EOpNull!
 0:18      'patch' (float)\r
 0:18      Constant:\r
 0:18        3.100000\r
+0:31  Function Definition: barWxyz( (void)\r
+0:31    Function Parameters: \r
+0:33    Sequence\r
+0:33      Sequence\r
+0:33        move second child to first child (2-component vector of int)\r
+0:33          't11' (2-component vector of int)\r
+0:33          Function Call: textureSize(s21; (2-component vector of int)\r
+0:33            'sms' (uniform sampler2DMS)\r
+0:34      Sequence\r
+0:34        move second child to first child (2-component vector of int)\r
+0:34          't12' (2-component vector of int)\r
+0:34          Function Call: textureSize(is21; (2-component vector of int)\r
+0:34            'isms' (uniform isampler2DMS)\r
+0:35      Sequence\r
+0:35        move second child to first child (2-component vector of int)\r
+0:35          't13' (2-component vector of int)\r
+0:35          Function Call: textureSize(us21; (2-component vector of int)\r
+0:35            'usms' (uniform usampler2DMS)\r
+0:36      Sequence\r
+0:36        move second child to first child (3-component vector of int)\r
+0:36          't21' (3-component vector of int)\r
+0:36          Function Call: textureSize(sA21; (3-component vector of int)\r
+0:36            'smsa' (uniform sampler2DMSArray)\r
+0:37      Sequence\r
+0:37        move second child to first child (3-component vector of int)\r
+0:37          't22' (3-component vector of int)\r
+0:37          Function Call: textureSize(isA21; (3-component vector of int)\r
+0:37            'ismsa' (uniform isampler2DMSArray)\r
+0:38      Sequence\r
+0:38        move second child to first child (3-component vector of int)\r
+0:38          't23' (3-component vector of int)\r
+0:38          Function Call: textureSize(usA21; (3-component vector of int)\r
+0:38            'usmsa' (uniform usampler2DMSArray)\r
+0:39      Sequence\r
+0:39        move second child to first child (4-component vector of float)\r
+0:39          't31' (4-component vector of float)\r
+0:39          Function Call: texelFetch(s21;vi2;i1; (4-component vector of float)\r
+0:39            'sms' (uniform sampler2DMS)\r
+0:39            'p2' (flat in 2-component vector of int)\r
+0:39            'samp' (flat in int)\r
+0:40      Sequence\r
+0:40        move second child to first child (4-component vector of int)\r
+0:40          't32' (4-component vector of int)\r
+0:40          Function Call: texelFetch(is21;vi2;i1; (4-component vector of int)\r
+0:40            'isms' (uniform isampler2DMS)\r
+0:40            'p2' (flat in 2-component vector of int)\r
+0:40            'samp' (flat in int)\r
+0:41      Sequence\r
+0:41        move second child to first child (4-component vector of uint)\r
+0:41          't33' (4-component vector of uint)\r
+0:41          Function Call: texelFetch(us21;vi2;i1; (4-component vector of uint)\r
+0:41            'usms' (uniform usampler2DMS)\r
+0:41            'p2' (flat in 2-component vector of int)\r
+0:41            Constant:\r
+0:41              3 (const int)\r
+0:42      Sequence\r
+0:42        move second child to first child (4-component vector of float)\r
+0:42          't41' (4-component vector of float)\r
+0:42          Function Call: texelFetch(sA21;vi3;i1; (4-component vector of float)\r
+0:42            'smsa' (uniform sampler2DMSArray)\r
+0:42            'p3' (flat in 3-component vector of int)\r
+0:42            'samp' (flat in int)\r
+0:43      Sequence\r
+0:43        move second child to first child (4-component vector of int)\r
+0:43          't42' (4-component vector of int)\r
+0:43          Function Call: texelFetch(isA21;vi3;i1; (4-component vector of int)\r
+0:43            'ismsa' (uniform isampler2DMSArray)\r
+0:43            Constant:\r
+0:43              2 (const int)\r
+0:43              2 (const int)\r
+0:43              2 (const int)\r
+0:43            'samp' (flat in int)\r
+0:44      Sequence\r
+0:44        move second child to first child (4-component vector of uint)\r
+0:44          't43' (4-component vector of uint)\r
+0:44          Function Call: texelFetch(usA21;vi3;i1; (4-component vector of uint)\r
+0:44            'usmsa' (uniform usampler2DMSArray)\r
+0:44            'p3' (flat in 3-component vector of int)\r
+0:44            'samp' (flat in int)\r
 0:?   Linker Objects\r
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)\r
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)\r
 0:?     'foo' (smooth in 4-component vector of float)\r
 0:?     's' (smooth in structure{float f})\r
 0:?     'patch' (float)\r
+0:?     'sms' (uniform sampler2DMS)\r
+0:?     'isms' (uniform isampler2DMS)\r
+0:?     'usms' (uniform usampler2DMS)\r
+0:?     'smsa' (uniform sampler2DMSArray)\r
+0:?     'ismsa' (uniform isampler2DMSArray)\r
+0:?     'usmsa' (uniform usampler2DMSArray)\r
+0:?     'p2' (flat in 2-component vector of int)\r
+0:?     'p3' (flat in 3-component vector of int)\r
+0:?     'samp' (flat in int)\r
 \r

diff --git a/Test/baseResults/150.geom.out b/Test/baseResults/150.geom.out
index 8646ebf..abda93b 100644 (file)
--- a/Test/baseResults/150.geom.out
+++ b/Test/baseResults/150.geom.out
@@ -1,5 +1,4 @@
 150.geom\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 ERROR: 0:15: 'fromVertex' : block instance name redefinition \r
 ERROR: 0:19: 'fromVertex' : redefinition \r
 ERROR: 0:21: 'fooC' : block instance name redefinition \r

diff --git a/Test/baseResults/150.tesc.out b/Test/baseResults/150.tesc.out
index 6de33cb..35c0848 100644 (file)
--- a/Test/baseResults/150.tesc.out
+++ b/Test/baseResults/150.tesc.out
@@ -1,5 +1,4 @@
 150.tesc\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 \r
 Shader version: 150\r
 Requested GL_ARB_tessellation_shader\r
@@ -109,7 +108,6 @@ vertices = 4
 0:?     'patchOut' (patch out 4-component vector of float)\r
 \r
 150.tese\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 ERROR: 0:12: 'barrier' : no matching overloaded function found \r
 ERROR: 1 compilation errors.  No code generated.\r
 \r

diff --git a/Test/baseResults/150.vert.out b/Test/baseResults/150.vert.out
index 2db24a7..85f7e43 100644 (file)
--- a/Test/baseResults/150.vert.out
+++ b/Test/baseResults/150.vert.out
@@ -1,5 +1,4 @@
 150.vert\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 ERROR: 0:22: 'a' : cannot redeclare a user-block member array \r
 ERROR: 1 compilation errors.  No code generated.\r
 \r

diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out
index caac12a..8b25322 100644 (file)
--- a/Test/baseResults/mains1.frag.out
+++ b/Test/baseResults/mains1.frag.out
@@ -16,7 +16,6 @@ Shader version: 110
 \r
 noMain1.geom\r
 ERROR: #version: geometry shaders require non-es profile and version 150 or above\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 ERROR: 1 compilation errors.  No code generated.\r
 \r
 \r
@@ -31,7 +30,6 @@ ERROR: node is still EOpNull!
 0:?   Linker Objects\r
 \r
 noMain2.geom\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 \r
 Shader version: 150\r
 invocations = 0\r

diff --git a/Test/baseResults/matrix2.frag.out b/Test/baseResults/matrix2.frag.out
index 02ce43f..54f40ef 100644 (file)
--- a/Test/baseResults/matrix2.frag.out
+++ b/Test/baseResults/matrix2.frag.out
@@ -1,5 +1,4 @@
 ../../LunarGLASS/test/matrix2.frag\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:13: varying deprecated in version 130; may be removed in future release\r
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release\r

diff --git a/Test/baseResults/simpleFunctionCall.frag.out b/Test/baseResults/simpleFunctionCall.frag.out
index fa43269..b479fea 100644 (file)
--- a/Test/baseResults/simpleFunctionCall.frag.out
+++ b/Test/baseResults/simpleFunctionCall.frag.out
@@ -1,5 +1,4 @@
 ../../LunarGLASS/test/simpleFunctionCall.frag\r
-Warning, version 150 is not yet complete; most version-specific features are present, but some are missing.\r
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release\r
 \r
 Shader version: 150\r

diff --git a/Todo.txt b/Todo.txt
index 68ab159..f8aff24 100644 (file)
--- a/Todo.txt
+++ b/Todo.txt
@@ -1,4 +1,4 @@
-Current functionality level: ESSL 3.0
+Current functionality level: ESSL 3.0, GLSL 1.5
 
 + create version system
 
@@ -91,13 +91,13 @@ Shader Functionality to Implement/Finish
         + Fixed functionality for a programmable stage. 
         + ftransform().  Use invariant outputs instead.
     GLSL 1.5 (Non-ES)
-      - Deprecated gl_MaxVaryingComponents
+      + Deprecated gl_MaxVaryingComponents
       + Add new minimum maximums for gl_MaxVertexOutputComponents, gl_MaxGeometryInputComponents, gl_MaxGeometryOutputComponents, and gl_MaxFragmentInputComponents, 
                 rather than relying on gl_MaxVaryingComponents.  Also, corrected gl_MaxVaryingComponents to be 60 instead of 64.
       + Added gl_PrimitiveID as an input to fragment shaders.
       + Added gl_FragCoord qualifiers origin_upper_left, and pixel_center_integer to modify the values returned by gl_FragCoord (and have no affect on any other aspect of the pipeline or language).
         + including redeclaration of gl_FragCoord that adds nothing
-      - Added support for multi-sample textures through sampler2DMS and sampler2DMSArray support in texelFetch() and textureSize().
+      + Added support for multi-sample textures through sampler2DMS and sampler2DMSArray support in texelFetch() and textureSize().
       + Broadened interface blocks from just uniforms to in and out interfaces as well.
       + Broaden array usage to include vertex shader inputs (vertex in).
       + Added geometry shaders.  This includes targeting layers in FBO rendering.

diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index fb62f4e..9e01cdf 100644 (file)
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -1423,7 +1423,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
     if (version >= 130)
         add2ndGenerationSamplingImaging(version, profile);
 
-    //printf("%s\n", commonBuiltins.c_str();
+    // printf("%s\n", commonBuiltins.c_str());
 }
 
 //
@@ -1914,8 +1914,10 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
         snprintf(builtInConstant, maxSize, "const int  gl_MaxVertexUniformComponents = %d;", resources.maxVertexUniformComponents);
         s.append(builtInConstant);
 
-        snprintf(builtInConstant, maxSize, "const int  gl_MaxVaryingFloats = %d;", resources.maxVaryingFloats);
-        s.append(builtInConstant);
+        if (version < 150 || ARBCompatibility) {
+            snprintf(builtInConstant, maxSize, "const int  gl_MaxVaryingFloats = %d;", resources.maxVaryingFloats);
+            s.append(builtInConstant);
+        }
 
         snprintf(builtInConstant, maxSize, "const int  gl_MaxFragmentUniformComponents = %d;", resources.maxFragmentUniformComponents);
         s.append(builtInConstant);

diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 62ff0c5..f02e120 100644 (file)
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -368,7 +368,7 @@ TIntermTyped* TIntermediate::setAggregateOperator(TIntermNode* node, TOperator o
 }
 
 //
-// Convert the node's type to the given type, as allowed by the operation involved 'op'.
+// Convert the node's type to the given type, as allowed by the operation involved: 'op'.
 // For implicit conversions, 'op' is not the requested conversion, it is the explicit 
 // operation requiring the implicit conversion.
 //
@@ -384,9 +384,13 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     //
     switch (node->getBasicType()) {
     case EbtVoid:
-    case EbtSampler:
         return 0;
-    default: break;
+    case EbtSampler:
+        if (op != EOpFunctionCall)
+            return 0;
+        break;
+    default:
+        break;
     }
 
     //
@@ -450,6 +454,7 @@ TIntermTyped* TIntermediate::addConversion(TOperator op, const TType& type, TInt
     case EOpMatrixTimesVector:
     case EOpMatrixTimesScalar:
 
+    case EOpFunctionCall:
     case EOpAssign:
     case EOpAddAssign:
     case EOpSubAssign:

diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 3fcdbaf..070eb35 100644 (file)
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -1078,11 +1078,13 @@ void TParseContext::addInputArgumentConversions(const TFunction& function, TInte
             if (function[i].type->getQualifier().isParamInput()) {
                 // In-qualified arguments just need an extra node added above the argument to
                 // convert to the correct type.
-                arg = intermediate.addConversion(EOpAssign, *function[i].type, arg);
-                if (aggregate)
-                    aggregate->getSequence()[i] = arg;
-                else
-                    arguments = arg;
+                arg = intermediate.addConversion(EOpFunctionCall, *function[i].type, arg);
+                if (arg) {
+                    if (aggregate)
+                        aggregate->getSequence()[i] = arg;
+                    else
+                        arguments = arg;
+                }
             }
         }
     }

diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
index e307b75..943ede0 100644 (file)
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -377,17 +377,24 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo
         infoSink.info.message(EPrefixError, "#version: statement must appear first in es-profile shader; before comments or newlines");
     }
 
-    // A metecheck on the condition of the compiler itself...
+    // A metacheck on the condition of the compiler itself...
     switch (version) {
+
+    // ES versions
     case 100:
     case 300:
+        // versions are complete
+        break;
 
+    // Desktop versions
     case 110:
     case 120:
     case 130:
     case 140:
+    case 150:
         // versions are complete
         break;
+
     default:
         infoSink.info << "Warning, version " << version << " is not yet complete; most version-specific features are present, but some are missing.\n";
         break;

diff --git a/glslang/MachineIndependent/glslang.y b/glslang/MachineIndependent/glslang.y
index f4dc901..a2157bc 100644 (file)
--- a/glslang/MachineIndependent/glslang.y
+++ b/glslang/MachineIndependent/glslang.y
@@ -1679,7 +1679,7 @@ type_specifier_nonarray
     | ISAMPLERCUBEARRAY {\r
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());\r
         $$.basicType = EbtSampler;\r
-        $$.sampler.set(EbtInt, Esd3D, true);\r
+        $$.sampler.set(EbtInt, EsdCube, true);\r
     }\r
     | USAMPLER1D {\r
         $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());\r