projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d61150d 0a2287c)
Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/opengl-es-cts-3.2.6
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Nov 2019 13:41:59 +0000 (14:41 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 22 Nov 2019 13:52:59 +0000 (14:52 +0100)
Change-Id: I069be78b5ad4a7299152d342c5cbfee6b7fc84f1

1  2 
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles2-master.txt patch | diff1 | diff2 | blob | history
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles2-master.txt patch | diff1 | diff2 | blob | history
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/src/gles2-spec-issues.txt patch | diff1 | | blob | history

diff --cc external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles2-master.txt
index e49fc73,2b6f7c7..3742dca
--- 1/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles2-master.txt
--- 2/android/cts/nyc/gles2-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles2-master.txt
@@@ -2233,12 -1850,7 +2233,9 @@@ 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.attribute_return_type_vertex
 +dEQP-GLES2.functional.shaders.functions.invalid.attribute_return_type_fragment
  dEQP-GLES2.functional.shaders.functions.invalid.main_invalid_return_type_vertex
  dEQP-GLES2.functional.shaders.functions.invalid.main_invalid_return_type_fragment
  dEQP-GLES2.functional.shaders.functions.invalid.main_has_arguments_vertex
diff --cc external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/src/gles2-spec-issues.txt
index 21298d3,0000000..af109c1
mode 100644,000000..100644
--- 1/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/src/gles2-spec-issues.txt
--- /dev/null
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/src/gles2-spec-issues.txt
@@@ -1,3 -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
Domain: Graphics System / GL;