Add GL_EXT_texture_sRGB_RG8 support

Affects:

dEQP-GLES3.functional.texture.format.sized.*.srgb_rg8*
dEQP-GLES3.functional.texture.filtering.*.formats.srgb_rg8*
dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8*
dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8*
dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.*

Components: OpenGL, AOSP

Change-Id: I5194f06dbfedc375ade3e8b4fc2e84aa65868df1

diff --git a/android/cts/master/gles3-master-2021-03-01.txt b/android/cts/master/gles3-master-2021-03-01.txt
index 847ace7..5d2cdae 100644 (file)
--- a/android/cts/master/gles3-master-2021-03-01.txt
+++ b/android/cts/master/gles3-master-2021-03-01.txt
@@ -1,3 +1,35 @@
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_npot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_npot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_npot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_npot
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.pbo_bounds_2d
 dEQP-GLES3.functional.ubo.single_nested_struct_mixed_matrix_packing.per_block_buffer.shared_block_row_major_matrix_row_major_matrixarray_row_major_vertex
 dEQP-GLES3.functional.ubo.single_nested_struct_mixed_matrix_packing.per_block_buffer.shared_block_row_major_matrix_row_major_matrixarray_row_major_fragment

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 99f72c4..924fe65 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -21282,6 +21282,8 @@ dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_pot
@@ -21392,6 +21394,8 @@ dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot
@@ -21502,6 +21506,8 @@ dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_pot
@@ -21612,6 +21618,8 @@ dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot
@@ -23312,6 +23320,12 @@ dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest_mipmap_nearest
@@ -23435,6 +23449,12 @@ dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_near
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest
@@ -23553,6 +23573,12 @@ dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest_mipmap_nearest
@@ -23680,6 +23706,12 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_nearest

diff --git a/android/cts/master/gles31-master-2021-03-01.txt b/android/cts/master/gles31-master-2021-03-01.txt
index aee8c2b..1ddf718 100644 (file)
--- a/android/cts/master/gles31-master-2021-03-01.txt
+++ b/android/cts/master/gles31-master-2021-03-01.txt
@@ -1,5 +1,20 @@
 dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_linear
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_pot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_npot
 dEQP-GLES31.functional.separate_shader.random.38
 dEQP-GLES31.functional.fbo.color.tex2d.r16
 dEQP-GLES31.functional.fbo.color.tex2d.rg16
 dEQP-GLES31.functional.fbo.color.tex2d.rgba16
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.skipped
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.enabled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.texel_fetch
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.conversion_gpu
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.toggled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.multiple_textures
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler

diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt
index 414235b..08f197e 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -12286,6 +12286,12 @@ dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_n
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest_mipmap_nearest
@@ -12474,6 +12480,8 @@ dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_npot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_pot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgb10_a2_pot
@@ -37668,6 +37676,13 @@ dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.conversion_gpu
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.toggled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.multiple_textures
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.using_sampler
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.skipped
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.enabled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.texel_fetch
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.conversion_gpu
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.toggled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.multiple_textures
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.skipped
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.enabled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.texel_fetch

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 459865d..804d324 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
@@ -21914,6 +21914,8 @@ dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_pot
@@ -22024,6 +22026,8 @@ dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot
@@ -22134,6 +22138,8 @@ dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_pot
@@ -22244,6 +22250,8 @@ dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot
@@ -23944,6 +23952,12 @@ dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24160,6 +24174,12 @@ dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_near
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24372,6 +24392,12 @@ dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24576,6 +24602,12 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_nearest

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles31-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles31-master.txt
index 1c6b003..b56b11e 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles31-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.5.x/gles31-master.txt
@@ -12326,6 +12326,12 @@ dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_n
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest_mipmap_nearest
@@ -12514,6 +12520,8 @@ dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_npot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_pot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgb10_a2_pot
@@ -37712,6 +37720,13 @@ dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.conversion_gpu
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.toggled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.multiple_textures
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.using_sampler
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.skipped
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.enabled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.texel_fetch
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.conversion_gpu
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.toggled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.multiple_textures
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.skipped
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.enabled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.texel_fetch

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 459865d..804d324 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
@@ -21914,6 +21914,8 @@ dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_pot
@@ -22024,6 +22026,8 @@ dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot
@@ -22134,6 +22138,8 @@ dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_pot
@@ -22244,6 +22250,8 @@ dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot
@@ -23944,6 +23952,12 @@ dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24160,6 +24174,12 @@ dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_near
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24372,6 +24392,12 @@ dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24576,6 +24602,12 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_nearest

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles31-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles31-master.txt
index 8f6b995..7104012 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles31-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/gles31-master.txt
@@ -12330,6 +12330,12 @@ dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_n
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest_mipmap_nearest
@@ -12518,6 +12524,8 @@ dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_npot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_pot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgb10_a2_pot
@@ -37716,6 +37724,13 @@ dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.conversion_gpu
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.toggled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.multiple_textures
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.using_sampler
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.skipped
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.enabled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.texel_fetch
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.conversion_gpu
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.toggled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.multiple_textures
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.skipped
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.enabled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.texel_fetch

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 459865d..804d324 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
@@ -21914,6 +21914,8 @@ dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d.rgb10_a2ui_pot
@@ -22024,6 +22026,8 @@ dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.cube.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.cube.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.cube.rgb10_a2ui_pot
@@ -22134,6 +22138,8 @@ dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.2d_array.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.2d_array.rgb10_a2ui_pot
@@ -22244,6 +22250,8 @@ dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb8_alpha8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_pot
 dEQP-GLES3.functional.texture.format.sized.3d.srgb_r8_npot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_pot
+dEQP-GLES3.functional.texture.format.sized.3d.srgb_rg8_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_pot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2_npot
 dEQP-GLES3.functional.texture.format.sized.3d.rgb10_a2ui_pot
@@ -23944,6 +23952,12 @@ dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24160,6 +24174,12 @@ dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_near
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.cube.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.cube.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24372,6 +24392,12 @@ dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.2d_array.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.2d_array.formats.rgb10_a2_nearest_mipmap_nearest
@@ -24576,6 +24602,12 @@ dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_neares
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_nearest
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_nearest_mipmap_linear
+dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_rg8_linear_mipmap_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear
 dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_nearest

diff --git a/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles31-master.txt b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles31-master.txt
index 8f6b995..7104012 100644 (file)
--- a/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles31-master.txt
+++ b/external/openglcts/data/mustpass/gles/aosp_mustpass/master/gles31-master.txt
@@ -12330,6 +12330,12 @@ dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_n
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_nearest_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.sr8_linear_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_nearest
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_nearest_mipmap_linear
+dEQP-GLES31.functional.texture.filtering.cube_array.formats.srg8_linear_mipmap_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_linear
 dEQP-GLES31.functional.texture.filtering.cube_array.formats.srgb8_alpha8_nearest_mipmap_nearest
@@ -12518,6 +12524,8 @@ dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgba8ui_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_r8_npot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_pot
+dEQP-GLES31.functional.texture.format.sized.cube_array.srgb_rg8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_pot
 dEQP-GLES31.functional.texture.format.sized.cube_array.srgb8_alpha8_npot
 dEQP-GLES31.functional.texture.format.sized.cube_array.rgb10_a2_pot
@@ -37716,6 +37724,13 @@ dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.conversion_gpu
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.toggled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.multiple_textures
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srgba8.using_sampler
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.skipped
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.enabled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.texel_fetch
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.conversion_gpu
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.toggled
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.multiple_textures
+dEQP-GLES31.functional.srgb_texture_decode.skip_decode.srg8.using_sampler
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.skipped
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.enabled
 dEQP-GLES31.functional.srgb_texture_decode.skip_decode.sr8.texel_fetch

diff --git a/modules/gles3/functional/es3fTextureFilteringTests.cpp b/modules/gles3/functional/es3fTextureFilteringTests.cpp
index fc8b27c..d965a05 100644 (file)
--- a/modules/gles3/functional/es3fTextureFilteringTests.cpp
+++ b/modules/gles3/functional/es3fTextureFilteringTests.cpp
@@ -72,7 +72,10 @@ namespace
 void checkSupport (const glu::ContextInfo& info, deUint32 internalFormat)
 {
        if (internalFormat == GL_SR8_EXT && !info.isExtensionSupported("GL_EXT_texture_sRGB_R8"))
-               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_decode is not supported.");
+               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_R8 is not supported.");
+
+       if (internalFormat == GL_SRG8_EXT && !info.isExtensionSupported("GL_EXT_texture_sRGB_RG8"))
+               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_RG8 is not supported.");
 }
 
 } // anonymous
@@ -1299,6 +1302,7 @@ void TextureFilteringTests::init (void)
                { "rgb5_a1",            GL_RGB5_A1                      },
                { "srgb8_alpha8",       GL_SRGB8_ALPHA8         },
                { "srgb_r8",            GL_SR8_EXT                      },
+               { "srgb_rg8",           GL_SRG8_EXT                     },
                { "rgb10_a2",           GL_RGB10_A2                     }
        };
 

diff --git a/modules/gles3/functional/es3fTextureFormatTests.cpp b/modules/gles3/functional/es3fTextureFormatTests.cpp
index 0bcfe84..bc0b60f 100644 (file)
--- a/modules/gles3/functional/es3fTextureFormatTests.cpp
+++ b/modules/gles3/functional/es3fTextureFormatTests.cpp
@@ -72,7 +72,10 @@ namespace
 void checkSupport (const glu::ContextInfo& info, deUint32 internalFormat)
 {
        if (internalFormat == GL_SR8_EXT && !info.isExtensionSupported("GL_EXT_texture_sRGB_R8"))
-               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_decode is not supported.");
+               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_R8 is not supported.");
+
+       if (internalFormat == GL_SRG8_EXT && !info.isExtensionSupported("GL_EXT_texture_sRGB_RG8"))
+               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_RG8 is not supported.");
 }
 
 } // anonymous
@@ -1368,6 +1371,7 @@ void TextureFormatTests::init (void)
                { "rgba8ui",                    GL_RGBA8UI,                     },
                { "srgb8_alpha8",               GL_SRGB8_ALPHA8,        },
                { "srgb_r8",                    GL_SR8_EXT,                     },
+               { "srgb_rg8",                   GL_SRG8_EXT,            },
                { "rgb10_a2",                   GL_RGB10_A2,            },
                { "rgb10_a2ui",                 GL_RGB10_A2UI,          },
                { "rgba4",                              GL_RGBA4,                       },

diff --git a/modules/gles31/functional/es31fSRGBDecodeTests.cpp b/modules/gles31/functional/es31fSRGBDecodeTests.cpp
index c07f14b..849e24f 100644 (file)
--- a/modules/gles31/functional/es31fSRGBDecodeTests.cpp
+++ b/modules/gles31/functional/es31fSRGBDecodeTests.cpp
@@ -958,6 +958,11 @@ void SRGBTestCase::init (void)
                throw tcu::NotSupportedError("Test requires GL_EXT_texture_sRGB_decode extension");
        }
 
+       if ( (glu::getInternalFormat(m_internalFormat) == GL_SRG8_EXT) && !(m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_sRGB_RG8")) )
+       {
+               throw tcu::NotSupportedError("Test requires GL_EXT_texture_sRGB_RG8 extension");
+       }
+
        if ( (glu::getInternalFormat(m_internalFormat) == GL_SR8_EXT) && !(m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_sRGB_R8")) )
        {
                throw tcu::NotSupportedError("Test requires GL_EXT_texture_sRGB_R8 extension");
@@ -1234,6 +1239,12 @@ tcu::Vec4 SRGBTestCase::formatReferenceColor (tcu::Vec4 referenceColor)
                {
                        return referenceColor;
                }
+               case GL_SRG8_EXT:
+               {
+                       // zero unwanted color channels
+                       referenceColor.z() = 0;
+                       return referenceColor;
+               }
                case GL_SR8_EXT:
                {
                        // zero unwanted color channels
@@ -1978,6 +1989,7 @@ void SRGBDecodeTests::init (void)
        const TestGroupConfig testGroupConfigList[] =
        {
                TestGroupConfig("srgba8",       "srgb decode tests using srgba internal format",        tcu::TextureFormat(tcu::TextureFormat::sRGBA, tcu::TextureFormat::UNORM_INT8)),
+               TestGroupConfig("srg8",         "srgb decode tests using srg8 internal format",         tcu::TextureFormat(tcu::TextureFormat::sRG, tcu::TextureFormat::UNORM_INT8)),
                TestGroupConfig("sr8",          "srgb decode tests using sr8 internal format",          tcu::TextureFormat(tcu::TextureFormat::sR, tcu::TextureFormat::UNORM_INT8))
        };
 

diff --git a/modules/gles31/functional/es31fTextureFilteringTests.cpp b/modules/gles31/functional/es31fTextureFilteringTests.cpp
index 45b4e63..ddbc07c 100644 (file)
--- a/modules/gles31/functional/es31fTextureFilteringTests.cpp
+++ b/modules/gles31/functional/es31fTextureFilteringTests.cpp
@@ -207,6 +207,9 @@ void TextureCubeArrayFilteringCase::init (void)
        if (m_internalFormat == GL_SR8_EXT && !(m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_sRGB_R8")))
                TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_R8 not supported");
 
+       if (m_internalFormat == GL_SRG8_EXT && !(m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_sRGB_RG8")))
+               TCU_THROW(NotSupportedError, "GL_EXT_texture_sRGB_RG8 not supported");
+
        try
        {
                const glw::Functions&                   gl                      = m_context.getRenderContext().getFunctions();
@@ -503,6 +506,7 @@ void TextureFilteringTests::init (void)
                { "rgba4",                      GL_RGBA4                        },
                { "rgb5_a1",            GL_RGB5_A1                      },
                { "sr8",                        GL_SR8_EXT                      },
+               { "srg8",                       GL_SRG8_EXT                     },
                { "srgb8_alpha8",       GL_SRGB8_ALPHA8         },
                { "rgb10_a2",           GL_RGB10_A2                     }
        };

diff --git a/modules/gles31/functional/es31fTextureFormatTests.cpp b/modules/gles31/functional/es31fTextureFormatTests.cpp
index 8c0015c..6d728a3 100644 (file)
--- a/modules/gles31/functional/es31fTextureFormatTests.cpp
+++ b/modules/gles31/functional/es31fTextureFormatTests.cpp
@@ -55,6 +55,7 @@ struct SupportedExtensions
 {
        bool cubeMapArray;
        bool sRGBR8;
+       bool sRGBRG8;
 };
 
 static tcu::CubeFace getCubeFaceFromNdx (int ndx)
@@ -82,6 +83,7 @@ SupportedExtensions checkSupport (const glu::ContextInfo& renderCtxInfoid)
 
        supportedExtensions.cubeMapArray = renderCtxInfoid.isExtensionSupported("GL_EXT_texture_cube_map_array");
        supportedExtensions.sRGBR8 = renderCtxInfoid.isExtensionSupported("GL_EXT_texture_sRGB_R8");
+       supportedExtensions.sRGBRG8 = renderCtxInfoid.isExtensionSupported("GL_EXT_texture_sRGB_RG8");
 
        return supportedExtensions;
 }
@@ -158,8 +160,9 @@ void TextureCubeArrayFormatCase::init (void)
 {
        const SupportedExtensions supportedExtensions = checkSupport(m_renderCtxInfo);
 
-       if ((supportedExtensions.cubeMapArray && m_format != GL_SR8_EXT) ||
-               (supportedExtensions.cubeMapArray && m_format == GL_SR8_EXT && supportedExtensions.sRGBR8))
+       if ((supportedExtensions.cubeMapArray && m_format != GL_SR8_EXT && m_format != GL_SRG8_EXT) ||
+               (supportedExtensions.cubeMapArray && m_format == GL_SR8_EXT && supportedExtensions.sRGBR8) ||
+               (supportedExtensions.cubeMapArray && m_format == GL_SRG8_EXT && supportedExtensions.sRGBRG8))
        {
                m_texture = m_dataType != GL_NONE
                                  ? new glu::TextureCubeArray(m_renderCtx, m_format, m_dataType, m_size, m_depth)       // Implicit internal format.
@@ -182,6 +185,10 @@ void TextureCubeArrayFormatCase::init (void)
 
                if (supportedExtensions.sRGBR8 == false)
                        m_testCtx.setTestResult(QP_TEST_RESULT_NOT_SUPPORTED, "texture srgb r8 not supported");
+
+               if (supportedExtensions.sRGBRG8 == false)
+                       m_testCtx.setTestResult(QP_TEST_RESULT_NOT_SUPPORTED, "texture srgb rg8 not supported");
+
        }
 }
 
@@ -473,6 +480,7 @@ void TextureFormatTests::init (void)
                { "rgba8i",                             GL_RGBA8I,                      },
                { "rgba8ui",                    GL_RGBA8UI,                     },
                { "srgb_r8",                    GL_SR8_EXT,                     },
+               { "srgb_rg8",                   GL_SRG8_EXT,            },
                { "srgb8_alpha8",               GL_SRGB8_ALPHA8,        },
                { "rgb10_a2",                   GL_RGB10_A2,            },
                { "rgb10_a2ui",                 GL_RGB10_A2UI,          },