Remove invalid precision macro negative tests

Remove tests that required that using precision as macro name should
make compilation fail.

Bug: 27702614
Change-Id: I3fe4b11c5e0d80e11ca91ceac6d95ee72646e8a4

diff --git a/android/cts/master/com.drawelements.deqp.gles31.xml b/android/cts/master/com.drawelements.deqp.gles31.xml
index 996aecd..2b03874 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@ -53492,18 +53492,6 @@
                                                        <Test name="precise_as_function_argument">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="precise_as_macro_name">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_variable">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_function">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_argument">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="advanced_blend">
                                                        <Test name="blend_qualifier_mismatch">
@@ -54811,18 +54799,6 @@
                                                        <Test name="precise_as_function_argument">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="precise_as_macro_name">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_variable">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_function">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_argument">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="advanced_blend">
                                                        <Test name="blend_qualifier_mismatch">
@@ -56127,18 +56103,6 @@
                                                        <Test name="precise_as_function_argument">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
-                                                       <Test name="precise_as_macro_name">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_variable">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_function">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="precise_as_macro_and_argument">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
                                                </TestCase>
                                                <TestCase name="advanced_blend">
                                                        <Test name="blend_qualifier_mismatch">

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index a0d243b..3869bb6 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -16749,10 +16749,6 @@ dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.textur
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_variable_name
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_function_name
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_function_argument
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_macro_name
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_macro_and_variable
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_macro_and_function
-dEQP-GLES31.functional.debug.negative_coverage.callbacks.precise.precise_as_macro_and_argument
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.advanced_blend.blend_qualifier_mismatch
 dEQP-GLES31.functional.debug.negative_coverage.callbacks.advanced_blend.attachment_advanced_equation
 dEQP-GLES31.functional.debug.negative_coverage.log.buffer.bind_buffer
@@ -17180,10 +17176,6 @@ dEQP-GLES31.functional.debug.negative_coverage.log.shader_directive.texture_cube
 dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_variable_name
 dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_function_name
 dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_function_argument
-dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_macro_name
-dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_macro_and_variable
-dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_macro_and_function
-dEQP-GLES31.functional.debug.negative_coverage.log.precise.precise_as_macro_and_argument
 dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.blend_qualifier_mismatch
 dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.attachment_advanced_equation
 dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.bind_buffer
@@ -17610,10 +17602,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.textur
 dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_variable_name
 dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_function_name
 dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_function_argument
-dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_macro_name
-dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_macro_and_variable
-dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_macro_and_function
-dEQP-GLES31.functional.debug.negative_coverage.get_error.precise.precise_as_macro_and_argument
 dEQP-GLES31.functional.debug.negative_coverage.get_error.advanced_blend.blend_qualifier_mismatch
 dEQP-GLES31.functional.debug.negative_coverage.get_error.advanced_blend.attachment_advanced_equation
 dEQP-GLES31.functional.debug.externally_generated.application_messages

diff --git a/modules/gles31/functional/es31fNegativePreciseTests.cpp b/modules/gles31/functional/es31fNegativePreciseTests.cpp
index 934b78b..c21cb7b 100644 (file)
--- a/modules/gles31/functional/es31fNegativePreciseTests.cpp
+++ b/modules/gles31/functional/es31fNegativePreciseTests.cpp
@@ -192,54 +192,6 @@ void precise_as_function_argument (NegativeTestContext& ctx)
        ctx.endSection();
 }
 
-void precise_as_macro_name (NegativeTestContext& ctx)
-{
-       TCU_CHECK_AND_THROW(NotSupportedError,
-               ctx.isExtensionSupported("GL_EXT_gpu_shader5") || contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)),
-               "This test requires support for the extension GL_EXT_gpu_shader5 or context version 3.2 or higher.");
-
-       ctx.beginSection("Test precise keyword as macro name.");
-       for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_shaderTypes); ++ndx)
-               generateAndVerifyShader(ctx, s_shaderTypes[ndx], TEST_PRECISE_AS_MACRO_NAME);
-       ctx.endSection();
-}
-
-void precise_as_macro_and_variable (NegativeTestContext& ctx)
-{
-       TCU_CHECK_AND_THROW(NotSupportedError,
-               ctx.isExtensionSupported("GL_EXT_gpu_shader5") || contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)),
-               "This test requires support for the extension GL_EXT_gpu_shader5 or context version 3.2 or higher.");
-
-       ctx.beginSection("Test precise keyword as macro and variable name.");
-       for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_shaderTypes); ++ndx)
-               generateAndVerifyShader(ctx, s_shaderTypes[ndx], TEST_PRECISE_MACRO_AND_VARIABLE);
-       ctx.endSection();
-}
-
-void precise_as_macro_and_function (NegativeTestContext& ctx)
-{
-       TCU_CHECK_AND_THROW(NotSupportedError,
-               ctx.isExtensionSupported("GL_EXT_gpu_shader5") || contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)),
-               "This test requires support for the extension GL_EXT_gpu_shader5 or context version 3.2 or higher.");
-
-       ctx.beginSection("Test precise keyword as macro and function name.");
-       for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_shaderTypes); ++ndx)
-               generateAndVerifyShader(ctx, s_shaderTypes[ndx], TEST_PRECISE_MACRO_AND_FUNCTION);
-       ctx.endSection();
-}
-
-void precise_as_macro_and_argument (NegativeTestContext& ctx)
-{
-       TCU_CHECK_AND_THROW(NotSupportedError,
-               ctx.isExtensionSupported("GL_EXT_gpu_shader5") || contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)),
-               "This test requires support for the extension GL_EXT_gpu_shader5 or context version 3.2 or higher.");
-
-       ctx.beginSection("Test precise keyword as macro and argument name.");
-       for (int ndx = 0; ndx < DE_LENGTH_OF_ARRAY(s_shaderTypes); ++ndx)
-               generateAndVerifyShader(ctx, s_shaderTypes[ndx], TEST_PRECISE_MACRO_AND_ARGUMENT);
-       ctx.endSection();
-}
-
 } // anonymous
 
 std::vector<FunctionContainer> getNegativePreciseTestFunctions (void)
@@ -249,10 +201,6 @@ std::vector<FunctionContainer> getNegativePreciseTestFunctions (void)
         {precise_as_variable_name,                     "precise_as_variable_name",                     "Test precise keyword as variable name."                        },
         {precise_as_function_name,                     "precise_as_function_name",                     "Test precise keyword as function name."                        },
         {precise_as_function_argument,         "precise_as_function_argument",         "Test precise keyword as argument name."                        },
-        {precise_as_macro_name,                                "precise_as_macro_name",                        "Test precise keyword as macro name."                           },
-        {precise_as_macro_and_variable,                "precise_as_macro_and_variable",        "Test precise keyword as macro and variable name."      },
-        {precise_as_macro_and_function,                "precise_as_macro_and_function",        "Test precise keyword as macro and function name."      },
-        {precise_as_macro_and_argument,                "precise_as_macro_and_argument",        "Test precise keyword as macro and argument name."      },
        };
 
        return std::vector<FunctionContainer>(DE_ARRAY_BEGIN(funcs), DE_ARRAY_END(funcs));