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 6c53f82..caadde6 100644 (file)
--- a/data/gles3/shaders/uniform_block.test
+++ b/data/gles3/shaders/uniform_block.test
@@ -4579,141 +4579,9 @@ group invalid "Invalid uniform interface block syntax tests."
                        }
                ""
        end
-       case double_underscore_block_name_vertex
-               version 300 es
-               expect compile_fail
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-
-
-                       uniform __
-                       {
-                               vec4 uniformMember;
-                       } uniformBlock;
-
-                       void main()
-                       {
-                               gl_Position = uniformBlock.uniformMember;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       void main()
-                       {
-                               o_color = vec4(1.0);
-                       }
-               ""
-       end
-       case double_underscore_block_name_fragment
-               version 300 es
-               expect compile_fail
-
-               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 __
-                       {
-                               vec4 uniformMember;
-                       } uniformBlock;
-
-                       void main()
-                       {
-                               o_color = uniformBlock.uniformMember;
-                       }
-               ""
-       end
-       case double_underscore_instance_name_vertex
-               version 300 es
-               expect compile_fail
-
-               vertex ""
-                       #version 300 es
-                       precision highp float;
-
-
-
-                       uniform UniformBlock
-                       {
-                               vec4 uniformMember;
-                       } __;
-
-                       void main()
-                       {
-                               gl_Position = __.uniformMember;
-                       }
-               ""
-
-               fragment ""
-                       #version 300 es
-                       precision highp float;
-
-                       layout(location=0) out vec4 o_color;
-
-                       void main()
-                       {
-                               o_color = vec4(1.0);
-                       }
-               ""
-       end
-       case double_underscore_instance_name_fragment
-               version 300 es
-               expect compile_fail
-
-               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;
-                       } __;
-
-                       void main()
-                       {
-                               o_color = __.uniformMember;
-                       }
-               ""
-       end
        case repeated_block_vertex
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4751,7 +4619,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_fragment
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4789,7 +4657,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_no_instance_name_vertex
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es
@@ -4827,7 +4695,7 @@ group invalid "Invalid uniform interface block syntax tests."
        end
        case repeated_block_no_instance_name_fragment
                version 300 es
-               expect build_successful
+               expect compile_fail
 
                vertex ""
                        #version 300 es