Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 11 May 2018 10:29:10 +0000 (12:29 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 11 May 2018 10:35:22 +0000 (12:35 +0200)
Change-Id: Ie711cb881e2de39c6bc881ae0ad72e16301145a3

1  2 
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles2-master.txt
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles3-master.txt
external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles31-master.txt
external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles2-master.txt
external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles3-master.txt
external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles31-master.txt

@@@ -1340,11 -1340,11 +1340,6 @@@ dEQP-GLES2.functional.shaders.declarati
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.uniform_in_fragment_main
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.varying_in_vertex_main
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.varying_in_fragment_main
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.float_partially_specified_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.float_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec2_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec3_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec4_fragment
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_vertex
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_fragment
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_xx_vertex
@@@ -2845,37 -2845,37 +2845,6 @@@ dEQP-GLES3.functional.shaders.declarati
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_out_fragment
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_vertex
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.float_partially_specified_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.float_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec2_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec3_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec4_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.samplerCubeShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.samplerCubeShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArray_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArrayShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArrayShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isamplerCube_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isamplerCube_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2DArray_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usamplerCube_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usamplerCube_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2DArray_fragment
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_vertex
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_fragment
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_xx_vertex
@@@ -4411,6 -4411,6 +4411,37 @@@ dEQP-GLES31.functional.shaders.arrays_o
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.uniform_block_fragment
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.storage_block_vertex
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.storage_block_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.float_partially_specified_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.float_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec2_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec3_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec4_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.samplerCubeShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.samplerCubeShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArray_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArrayShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArrayShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isamplerCube_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isamplerCube_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2DArray_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usamplerCube_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usamplerCube_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2DArray_fragment
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.input_type_mismatch
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.output_type_mismatch
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.input_different_precision
@@@ -1369,11 -1369,11 +1369,6 @@@ dEQP-GLES2.functional.shaders.declarati
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.varying_in_fragment_main
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.invariant_attribute
  dEQP-GLES2.functional.shaders.declarations.invalid_declarations.invariant_uniform
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.float_partially_specified_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.float_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec2_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec3_fragment
--dEQP-GLES2.functional.shaders.declarations.unspecified_precision.vec4_fragment
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_vertex
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_fragment
  dEQP-GLES2.functional.shaders.swizzles.vector_swizzles.mediump_vec2_xx_vertex
@@@ -2847,37 -2847,37 +2847,6 @@@ dEQP-GLES3.functional.shaders.declarati
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_out_fragment
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_vertex
  dEQP-GLES3.functional.shaders.declarations.invalid_declarations.uniform_block_const_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.float_partially_specified_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.float_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec2_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec3_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.vec4_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.samplerCubeShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.samplerCubeShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArray_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArrayShadow_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.sampler2DArrayShadow_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isamplerCube_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isamplerCube_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.isampler2DArray_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler3D_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler3D_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usamplerCube_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usamplerCube_fragment
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2DArray_vertex
--dEQP-GLES3.functional.shaders.declarations.unspecified_precision.usampler2DArray_fragment
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_vertex
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_x_fragment
  dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_vec2_xx_vertex
@@@ -4423,6 -4423,6 +4423,37 @@@ dEQP-GLES31.functional.shaders.arrays_o
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.uniform_block_fragment
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.storage_block_vertex
  dEQP-GLES31.functional.shaders.arrays_of_arrays.es32.invalid.storage_block_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.float_partially_specified_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.float_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec2_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec3_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.vec4_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.samplerCubeShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.samplerCubeShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArray_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArrayShadow_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.sampler2DArrayShadow_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isamplerCube_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isamplerCube_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.isampler2DArray_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler3D_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler3D_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usamplerCube_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usamplerCube_fragment
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2DArray_vertex
++dEQP-GLES31.functional.shaders.linkage.es31.declarations.unspecified_precision.usampler2DArray_fragment
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.input_type_mismatch
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.output_type_mismatch
  dEQP-GLES31.functional.shaders.linkage.es31.geometry.varying.rules.input_different_precision