Merge vk-gl-cts/opengl-es-cts-3.2.6 into vk-gl-cts/master

Change-Id: I7c7197ea5881a8bdf500d19b834270807ed30ce9

diff --cc external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles2-master.txt
index 164c179,164c179..b70bffc
--- 1/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles2-master.txt
--- 2/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles2-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles2-master.txt
@@@ -145,8 -145,8 +145,6 @@@ dEQP-GLES2.functional.shaders.preproces
  dEQP-GLES2.functional.shaders.preprocessor.basic.empty_function_fragment
  dEQP-GLES2.functional.shaders.preprocessor.basic.empty_directive_vertex
  dEQP-GLES2.functional.shaders.preprocessor.basic.empty_directive_fragment
--dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_vertex
--dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_fragment
  dEQP-GLES2.functional.shaders.preprocessor.definitions.define_value_and_function_vertex
  dEQP-GLES2.functional.shaders.preprocessor.definitions.define_value_and_function_fragment
  dEQP-GLES2.functional.shaders.preprocessor.definitions.undefine_object_invalid_syntax_vertex
@@@ -2264,9 -2264,9 +2262,6 @@@ dEQP-GLES2.functional.shaders.functions
  dEQP-GLES2.functional.shaders.functions.invalid.attribute_local_fragment
  dEQP-GLES2.functional.shaders.functions.invalid.uniform_argument_vertex
  dEQP-GLES2.functional.shaders.functions.invalid.uniform_argument_fragment
--dEQP-GLES2.functional.shaders.functions.invalid.varying_argument_vertex
--dEQP-GLES2.functional.shaders.functions.invalid.varying_argument_fragment
--dEQP-GLES2.functional.shaders.functions.invalid.attribute_argument_vertex
  dEQP-GLES2.functional.shaders.functions.invalid.attribute_argument_fragment
  dEQP-GLES2.functional.shaders.functions.invalid.uniform_return_type_vertex
  dEQP-GLES2.functional.shaders.functions.invalid.uniform_return_type_fragment

diff --cc external/openglcts/data/mustpass/gles/aosp_mustpass/master/src/gles2-spec-issues.txt
index 0000000,0000000..af109c1
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/src/gles2-spec-issues.txt
@@@ -1,0 -1,0 +1,8 @@@
++#VK-GL-CTS 294
++dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_vertex
++dEQP-GLES2.functional.shaders.preprocessor.basic.identifier_with_double_underscore_fragment
++
++#VK-GL-CTS 2116
++dEQP-GLES2.functional.shaders.functions.invalid.attribute_argument_vertex
++dEQP-GLES2.functional.shaders.functions.invalid.varying_argument_fragment
++dEQP-GLES2.functional.shaders.functions.invalid.varying_argument_vertex

diff --cc external/openglcts/scripts/build_mustpass.py
index c7409ea,c7409ea..9795860
--- 1/external/openglcts/scripts/build_mustpass.py
--- 2/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@@ -454,7 -454,7 +454,8 @@@ MASTER_EGL_PKG                                             = Package(module = 
  
  MASTER_GLES2_COMMON_FILTERS                   = [
                                include("gles2-master.txt"),
--                              exclude("gles2-test-issues.txt")
++                              exclude("gles2-test-issues.txt"),
++                              exclude("gles2-spec-issues.txt")
                ]
  MASTER_GLES2_PKG         = Package(module = ES2CTS_MODULE, configurations = [
          # Master