resolve merge conflicts of 76a147bf to deqp-dev

[platform/upstream/VK-GL-CTS.git] / data / gles3 / shaders / uniform_block.test

diff --git a/data/gles3/shaders/uniform_block.test b/data/gles3/shaders/uniform_block.test
index 2a45400..caadde6 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
@@ -4731,7 +4579,7 @@ group invalid "Invalid uniform interface block syntax tests."
                        }
                ""
        end
-       case double_underscore_block_name_vertex
+       case repeated_block_vertex
                version 300 es
                expect compile_fail
 
@@ -4741,14 +4589,19 @@ group invalid "Invalid uniform interface block syntax tests."
 
 
 
-                       uniform __
+                       uniform UniformBlock
                        {
                                vec4 uniformMember;
-                       } uniformBlock;
+                       } uniformBlockA;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockB;
 
                        void main()
                        {
-                               gl_Position = uniformBlock.uniformMember;
+                               gl_Position = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
                        }
                ""
 
@@ -4764,7 +4617,7 @@ group invalid "Invalid uniform interface block syntax tests."
                        }
                ""
        end
-       case double_underscore_block_name_fragment
+       case repeated_block_fragment
                version 300 es
                expect compile_fail
 
@@ -4786,18 +4639,23 @@ group invalid "Invalid uniform interface block syntax tests."
 
                        layout(location=0) out vec4 o_color;
 
-                       uniform __
+                       uniform UniformBlock
                        {
                                vec4 uniformMember;
-                       } uniformBlock;
+                       } uniformBlockA;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       } uniformBlockB;
 
                        void main()
                        {
-                               o_color = uniformBlock.uniformMember;
+                               o_color = uniformBlockA.uniformMember + uniformBlockB.uniformMember;
                        }
                ""
        end
-       case double_underscore_instance_name_vertex
+       case repeated_block_no_instance_name_vertex
                version 300 es
                expect compile_fail
 
@@ -4810,11 +4668,16 @@ group invalid "Invalid uniform interface block syntax tests."
                        uniform UniformBlock
                        {
                                vec4 uniformMember;
-                       } __;
+                       } uniformBlock;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       };
 
                        void main()
                        {
-                               gl_Position = __.uniformMember;
+                               gl_Position = uniformBlock.uniformMember + uniformMember;
                        }
                ""
 
@@ -4830,7 +4693,7 @@ group invalid "Invalid uniform interface block syntax tests."
                        }
                ""
        end
-       case double_underscore_instance_name_fragment
+       case repeated_block_no_instance_name_fragment
                version 300 es
                expect compile_fail
 
@@ -4855,11 +4718,16 @@ group invalid "Invalid uniform interface block syntax tests."
                        uniform UniformBlock
                        {
                                vec4 uniformMember;
-                       } __;
+                       } uniformBlock;
+
+                       uniform UniformBlock
+                       {
+                               vec4 uniformMember;
+                       };
 
                        void main()
                        {
-                               o_color = __.uniformMember;
+                               o_color = uniformBlock.uniformMember + uniformMember;
                        }
                ""
        end