Move GLSL 3.00 ES repeated uniform blocks to invalid group.

Bug: 20421050
Change-Id: I1587d17ddf7801f13da6d997c4917b0b254892db

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 4e0206502aef1be9db68454d37dc0052053c6b9a..03340a4211d5a3b153b137a4d9c3f9cd4e9f5eae 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -13979,18 +13979,6 @@
                                                <Test name="same_variable_and_instance_name_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="repeated_block_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="repeated_block_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="repeated_block_no_instance_name_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="repeated_block_no_instance_name_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="struct_member_vertex">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
@@ -14263,6 +14251,18 @@
                                                <Test name="double_underscore_instance_name_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
+                                               <Test name="repeated_block_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="repeated_block_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="repeated_block_no_instance_name_vertex">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
+                                               <Test name="repeated_block_no_instance_name_fragment">
+                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
+                                               </Test>
                                        </TestCase>
                                </TestSuite>
                                <TestCase name="discard">

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index a444e765a1e45db552e956b43bec9ae03f02508f..e4c1909ab5114dc7e730f23d3b16af49873fe6a4 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -4501,10 +4501,6 @@ dEQP-GLES3.functional.shaders.uniform_block.valid.same_variable_and_block_name_v
 dEQP-GLES3.functional.shaders.uniform_block.valid.same_variable_and_block_name_fragment
 dEQP-GLES3.functional.shaders.uniform_block.valid.same_variable_and_instance_name_vertex
 dEQP-GLES3.functional.shaders.uniform_block.valid.same_variable_and_instance_name_fragment
-dEQP-GLES3.functional.shaders.uniform_block.valid.repeated_block_vertex
-dEQP-GLES3.functional.shaders.uniform_block.valid.repeated_block_fragment
-dEQP-GLES3.functional.shaders.uniform_block.valid.repeated_block_no_instance_name_vertex
-dEQP-GLES3.functional.shaders.uniform_block.valid.repeated_block_no_instance_name_fragment
 dEQP-GLES3.functional.shaders.uniform_block.valid.struct_member_vertex
 dEQP-GLES3.functional.shaders.uniform_block.valid.struct_member_fragment
 dEQP-GLES3.functional.shaders.uniform_block.valid.struct_member_layout_row_major_vertex
@@ -4595,6 +4591,10 @@ dEQP-GLES3.functional.shaders.uniform_block.invalid.double_underscore_block_name
 dEQP-GLES3.functional.shaders.uniform_block.invalid.double_underscore_block_name_fragment
 dEQP-GLES3.functional.shaders.uniform_block.invalid.double_underscore_instance_name_vertex
 dEQP-GLES3.functional.shaders.uniform_block.invalid.double_underscore_instance_name_fragment
+dEQP-GLES3.functional.shaders.uniform_block.invalid.repeated_block_vertex
+dEQP-GLES3.functional.shaders.uniform_block.invalid.repeated_block_fragment
+dEQP-GLES3.functional.shaders.uniform_block.invalid.repeated_block_no_instance_name_vertex
+dEQP-GLES3.functional.shaders.uniform_block.invalid.repeated_block_no_instance_name_fragment
 dEQP-GLES3.functional.shaders.discard.basic_always
 dEQP-GLES3.functional.shaders.discard.basic_never
 dEQP-GLES3.functional.shaders.discard.basic_uniform

diff --git a/data/gles3/shaders/uniform_block.test b/data/gles3/shaders/uniform_block.test
index 2a45400998334efc481090c16f0ea4ebeabb3139..6c53f82d2e098cbbaba1c76049fcc908ce6852f0 100644 (file)
--- a/data/gles3/shaders/uniform_block.test
+++ b/data/gles3/shaders/uniform_block.test
@@ -1619,158 +1619,6 @@ group valid "Valid uniform interface block syntax tests."
                        }
                ""
        end
-       case repeated_block_vertex
-               version 300 es
-               expect build_successful
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlockA;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlockB;
-
-                       void main()
-                       {
-                               gl_Position = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       void main()
-                       {
-                               o_color = vec4(1.0);
-                       }
-               ""
-       end
-       case repeated_block_fragment
-               version 300 es
-               expect build_successful
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-                       in vec4 a_pos;
-
-                       void main()
-                       {
-                               gl_Position = a_pos;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlockA;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlockB;
-
-                       void main()
-                       {
-                               o_color = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
-                       }
-               ""
-       end
-       case repeated_block_no_instance_name_vertex
-               version 300 es
-               expect build_successful
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlock;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       };
-
-                       void main()
-                       {
-                               gl_Position = uniformBlock.uniformMember + uniformMember;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       void main()
-                       {
-                               o_color = vec4(1.0);
-                       }
-               ""
-       end
-       case repeated_block_no_instance_name_fragment
-               version 300 es
-               expect build_successful
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-                       in vec4 a_pos;
-
-                       void main()
-                       {
-                               gl_Position = a_pos;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } uniformBlock;
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       };
-
-                       void main()
-                       {
-                               o_color = uniformBlock.uniformMember + uniformMember;
-                       }
-               ""
-       end
        case struct_member_vertex
                version 300 es
                expect build_successful
@@ -4863,5 +4711,157 @@ group invalid "Invalid uniform interface block syntax tests."
                        }
                ""
        end
+       case repeated_block_vertex
+               version 300 es
+               expect build_successful
+
+               vertex ""
+                       #version 300 es
+                       precision highp float;
+
+
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockA;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockB;
+
+                       void main()
+                       {
+                               gl_Position = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
+                       }
+               ""
+
+               fragment ""
+                       #version 300 es
+                       precision highp float;
+
+                       layout(location=0) out vec4 o_color;
+
+                       void main()
+                       {
+                               o_color = vec4(1.0);
+                       }
+               ""
+       end
+       case repeated_block_fragment
+               version 300 es
+               expect build_successful
+
+               vertex ""
+                       #version 300 es
+                       precision highp float;
+
+                       in vec4 a_pos;
+
+                       void main()
+                       {
+                               gl_Position = a_pos;
+                       }
+               ""
+
+               fragment ""
+                       #version 300 es
+                       precision highp float;
+
+                       layout(location=0) out vec4 o_color;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockA;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockB;
+
+                       void main()
+                       {
+                               o_color = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
+                       }
+               ""
+       end
+       case repeated_block_no_instance_name_vertex
+               version 300 es
+               expect build_successful
+
+               vertex ""
+                       #version 300 es
+                       precision highp float;
+
+
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlock;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       };
+
+                       void main()
+                       {
+                               gl_Position = uniformBlock.uniformMember + uniformMember;
+                       }
+               ""
+
+               fragment ""
+                       #version 300 es
+                       precision highp float;
+
+                       layout(location=0) out vec4 o_color;
+
+                       void main()
+                       {
+                               o_color = vec4(1.0);
+                       }
+               ""
+       end
+       case repeated_block_no_instance_name_fragment
+               version 300 es
+               expect build_successful
+
+               vertex ""
+                       #version 300 es
+                       precision highp float;
+
+                       in vec4 a_pos;
+
+                       void main()
+                       {
+                               gl_Position = a_pos;
+                       }
+               ""
+
+               fragment ""
+                       #version 300 es
+                       precision highp float;
+
+                       layout(location=0) out vec4 o_color;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlock;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       };
+
+                       void main()
+                       {
+                               o_color = uniformBlock.uniformMember + uniformMember;
+                       }
+               ""
+       end
 
 end # invalid

diff --git a/modules/gles3/scripts/gen-uniform-blocks.py b/modules/gles3/scripts/gen-uniform-blocks.py
index 24a4e8bccd040e7903b544ecbdc3488ca9246707..9da1d551979d716e3c4afa728a7719e78eb44b9f 100644 (file)
--- a/modules/gles3/scripts/gen-uniform-blocks.py
+++ b/modules/gles3/scripts/gen-uniform-blocks.py
@@ -394,8 +394,6 @@ validCases = (createCases("repeat_interface_qualifier", repeatShaderTemplate, Tr
                        + createCases("no_instance_name", noInstanceNameShaderTemplate, True)
                        + createCases("same_variable_and_block_name", sameVariableAndBlockNameShaderTemplate, True)
                        + createCases("same_variable_and_instance_name", sameVariableAndInstanceNameShaderTemplate, True)
-                       + createCases("repeated_block", repeatedBlockShaderTemplate, True)
-                       + createCases("repeated_block_no_instance_name", repeatedBlockNoInstanceNameShaderTemplate, True)
                        + createCases("struct_member", structMemberShaderTemplate, True)
                        + sum([createCases("struct_member_layout_%s" % qualifier, layoutStructMemberQualifierShaderTemplate % qualifier, True)
                                                for qualifier in ["row_major", "column_major"]], [])
@@ -912,6 +910,8 @@ invalidCases = (
                        + createCases("invalid_identifier_instance_name", invalidIdentifierInstanceNameShaderTemplate, False)
                        + createCases("double_underscore_block_name", doubleUnderscoreIdentifierBlockNameShaderTemplate, False)
                        + createCases("double_underscore_instance_name", doubleUnderscoreIdentifierInstanceNameShaderTemplate, False)
+                       + createCases("repeated_block", repeatedBlockShaderTemplate, True)
+                       + createCases("repeated_block_no_instance_name", repeatedBlockNoInstanceNameShaderTemplate, True)
                )
 
 allCases.append(CaseGroup("valid", "Valid uniform interface block syntax tests.", validCases))