Remove invalid reserved keywords tests

These identifiers are not listed as reserved in any spec that I can
find.

Components: OpenGLES
Removed Tests: dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image*Shadow_*

Change-Id: I444d9a8a49d3dda7402faa50b79859aaef0ee690

diff --git a/android/cts/master/src/gles3-driver-issues.txt b/android/cts/master/src/gles3-driver-issues.txt
index e4d641e..3babe9f 100644 (file)
--- a/android/cts/master/src/gles3-driver-issues.txt
+++ b/android/cts/master/src/gles3-driver-issues.txt
@@ -362,14 +362,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/data/gles3/shaders/keywords.test b/data/gles3/shaders/keywords.test
index b588cd7..a4ffa5f 100644 (file)
--- a/data/gles3/shaders/keywords.test
+++ b/data/gles3/shaders/keywords.test
@@ -2563,78 +2563,6 @@ group reserved_keywords "Usage of reserved keywords as identifiers."
                        }
                ""
        end
-       case image1DShadow
-               expect compile_fail
-               values {}
-               version 300 es
-
-               both ""
-                       #version 300 es
-                       precision mediump float;
-                       ${DECLARATIONS}
-
-                       void main()
-                       {
-                               ${SETUP}
-                               float image1DShadow = 1.0;
-                               ${OUTPUT}
-                       }
-               ""
-       end
-       case image2DShadow
-               expect compile_fail
-               values {}
-               version 300 es
-
-               both ""
-                       #version 300 es
-                       precision mediump float;
-                       ${DECLARATIONS}
-
-                       void main()
-                       {
-                               ${SETUP}
-                               float image2DShadow = 1.0;
-                               ${OUTPUT}
-                       }
-               ""
-       end
-       case image1DArrayShadow
-               expect compile_fail
-               values {}
-               version 300 es
-
-               both ""
-                       #version 300 es
-                       precision mediump float;
-                       ${DECLARATIONS}
-
-                       void main()
-                       {
-                               ${SETUP}
-                               float image1DArrayShadow = 1.0;
-                               ${OUTPUT}
-                       }
-               ""
-       end
-       case image2DArrayShadow
-               expect compile_fail
-               values {}
-               version 300 es
-
-               both ""
-                       #version 300 es
-                       precision mediump float;
-                       ${DECLARATIONS}
-
-                       void main()
-                       {
-                               ${SETUP}
-                               float image2DArrayShadow = 1.0;
-                               ${OUTPUT}
-                       }
-               ""
-       end
        case imageBuffer
                expect compile_fail
                values {}

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt
index 45156af..a663582 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/gles3-master.txt
@@ -4210,14 +4210,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-master.txt
index 837c784..ff54dab 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.3.x/src/gles3-master.txt
@@ -4221,14 +4221,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles3-master.txt
index f9e8ab3..5841faa 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/gles3-master.txt
@@ -4770,14 +4770,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles3-master.txt
index 50f6b7b..3e21fae 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.4.x/src/gles3-master.txt
@@ -4781,14 +4781,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles3-master.txt
index 804d324..4a88a14 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles3-master.txt
@@ -4780,14 +4780,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles3-master.txt
index 804d324..4a88a14 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles3-master.txt
@@ -4780,14 +4780,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles3-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles3-master.txt
index 804d324..4a88a14 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles3-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles3-master.txt
@@ -4780,14 +4780,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage1DArray_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.uimage2DArray_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image1DArrayShadow_fragment
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_vertex
-dEQP-GLES3.functional.shaders.keywords.reserved_keywords.image2DArrayShadow_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.imageBuffer_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.iimageBuffer_vertex

diff --git a/modules/gles3/scripts/gen-keywords.py b/modules/gles3/scripts/gen-keywords.py
index 3d5a4df..e326784 100644 (file)
--- a/modules/gles3/scripts/gen-keywords.py
+++ b/modules/gles3/scripts/gen-keywords.py
@@ -83,8 +83,8 @@ RESERVED_KEYWORDS = [
        "hvec2", "hvec3", "hvec4", "dvec2", "dvec3", "dvec4", "fvec2", "fvec3", "fvec4", "sampler3DRect",
        "filter", "image1D", "image2D", "image3D", "imageCube", "iimage1D", "iimage2D", "iimage3D",
        "iimageCube", "uimage1D", "uimage2D", "uimage3D", "uimageCube", "image1DArray", "image2DArray",
-       "iimage1DArray", "iimage2DArray", "uimage1DArray", "uimage2DArray", "image1DShadow", "image2DShadow",
-       "image1DArrayShadow", "image2DArrayShadow", "imageBuffer", "iimageBuffer", "uimageBuffer",
+       "iimage1DArray", "iimage2DArray", "uimage1DArray", "uimage2DArray",
+       "imageBuffer", "iimageBuffer", "uimageBuffer",
        "sampler1D", "sampler1DShadow", "sampler1DArray", "sampler1DArrayShadow", "isampler1D",
        "isampler1DArray", "usampler1D", "usampler1DArray", "sampler2DRect", "sampler2DRectShadow",
        "isampler2DRect", "usampler2DRect", "samplerBuffer", "isamplerBuffer", "usamplerBuffer",