Remove EGLImage tests affected by rounding issues from mustpass
Bug: 27702713
Change-Id: Iac449e0ee746b6e85c652b600a1ab7d77e9562ec
diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index 2a94b57..aacee95 100644
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -3036,10 +3036,10 @@
<Test name="gles2_texture_rgba8_read_pixels">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="gles2_texture_rgba5_a1_texture">
+ <Test name="gles2_texture_rgb5_a1_texture">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="gles2_texture_rgba5_a1_read_pixels">
+ <Test name="gles2_texture_rgb5_a1_read_pixels">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
<Test name="gles2_texture_rgba4_texture">
@@ -3167,13 +3167,10 @@
<Test name="tex_rgba8_renderbuffer_clear_color">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="tex_rgba5_a1_tex_subimage_rgba8">
+ <Test name="tex_rgb5_a1_tex_subimage_rgb5_a1">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="tex_rgba5_a1_tex_subimage_rgba5_a1">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="tex_rgba5_a1_renderbuffer_clear_color">
+ <Test name="tex_rgb5_a1_renderbuffer_clear_color">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
<Test name="tex_rgba4_tex_subimage_rgba8">
@@ -3194,10 +3191,7 @@
<Test name="renderbuffer_rgba4_renderbuffer_clear_color">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="renderbuffer_rgb5_a1_tex_subimage_rgba8">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="renderbuffer_rgb5_a1_tex_subimage_rgba5_a1">
+ <Test name="renderbuffer_rgb5_a1_tex_subimage_rgb5_a1">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
<Test name="renderbuffer_rgb5_a1_renderbuffer_clear_color">
@@ -3238,10 +3232,10 @@
<Test name="gles2_texture_rgba8_read_pixels">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="gles2_texture_rgba5_a1_texture">
+ <Test name="gles2_texture_rgb5_a1_texture">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
- <Test name="gles2_texture_rgba5_a1_read_pixels">
+ <Test name="gles2_texture_rgb5_a1_read_pixels">
<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
</Test>
<Test name="gles2_texture_rgba4_texture">
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 1315531..7c2154e 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -954,8 +954,8 @@
dEQP-EGL.functional.image.create.gles2_texture_rgb565_read_pixels
dEQP-EGL.functional.image.create.gles2_texture_rgba8_texture
dEQP-EGL.functional.image.create.gles2_texture_rgba8_read_pixels
-dEQP-EGL.functional.image.create.gles2_texture_rgba5_a1_texture
-dEQP-EGL.functional.image.create.gles2_texture_rgba5_a1_read_pixels
+dEQP-EGL.functional.image.create.gles2_texture_rgb5_a1_texture
+dEQP-EGL.functional.image.create.gles2_texture_rgb5_a1_read_pixels
dEQP-EGL.functional.image.create.gles2_texture_rgba4_texture
dEQP-EGL.functional.image.create.gles2_texture_rgba4_read_pixels
dEQP-EGL.functional.image.create.gles2_cubemap_positive_x_rgba_texture
@@ -997,17 +997,15 @@
dEQP-EGL.functional.image.modify.tex_rgb565_renderbuffer_clear_color
dEQP-EGL.functional.image.modify.tex_rgba8_tex_subimage_rgba8
dEQP-EGL.functional.image.modify.tex_rgba8_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.tex_rgba5_a1_tex_subimage_rgba8
-dEQP-EGL.functional.image.modify.tex_rgba5_a1_tex_subimage_rgba5_a1
-dEQP-EGL.functional.image.modify.tex_rgba5_a1_renderbuffer_clear_color
+dEQP-EGL.functional.image.modify.tex_rgb5_a1_tex_subimage_rgb5_a1
+dEQP-EGL.functional.image.modify.tex_rgb5_a1_renderbuffer_clear_color
dEQP-EGL.functional.image.modify.tex_rgba4_tex_subimage_rgba8
dEQP-EGL.functional.image.modify.tex_rgba4_tex_subimage_rgba4
dEQP-EGL.functional.image.modify.tex_rgba4_renderbuffer_clear_color
dEQP-EGL.functional.image.modify.renderbuffer_rgba4_tex_subimage_rgba8
dEQP-EGL.functional.image.modify.renderbuffer_rgba4_tex_subimage_rgba4
dEQP-EGL.functional.image.modify.renderbuffer_rgba4_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_tex_subimage_rgba8
-dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_tex_subimage_rgba5_a1
+dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_tex_subimage_rgb5_a1
dEQP-EGL.functional.image.modify.renderbuffer_rgb5_a1_renderbuffer_clear_color
dEQP-EGL.functional.image.modify.renderbuffer_rgb565_tex_subimage_rgb8
dEQP-EGL.functional.image.modify.renderbuffer_rgb565_tex_subimage_rgb565
@@ -1020,8 +1018,8 @@
dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb565_read_pixels
dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba8_texture
dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba8_read_pixels
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba5_a1_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba5_a1_read_pixels
+dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb5_a1_texture
+dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb5_a1_read_pixels
dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba4_texture
dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgba4_read_pixels
dEQP-EGL.functional.image.render_multiple_contexts.gles2_cubemap_positive_x_rgba8_texture
diff --git a/android/cts/master/src/egl-test-issues.txt b/android/cts/master/src/egl-test-issues.txt
index b8517be..47d59b3 100644
--- a/android/cts/master/src/egl-test-issues.txt
+++ b/android/cts/master/src/egl-test-issues.txt
@@ -17,3 +17,6 @@
dEQP-EGL.functional.multithread.pixmap_context
dEQP-EGL.functional.multithread.pixmap_single_window
dEQP-EGL.functional.multithread.pixmap_single_window_context
+
+# Bug: 27702713
+dEQP-EGL.functional.image.modify.*_rgb5_a1_tex_subimage_rgba8
diff --git a/modules/egl/teglImageFormatTests.cpp b/modules/egl/teglImageFormatTests.cpp
index 8d6cea0..b0eea94 100644
--- a/modules/egl/teglImageFormatTests.cpp
+++ b/modules/egl/teglImageFormatTests.cpp
@@ -1104,7 +1104,7 @@
addCreateTexture(prefix + "rgb8", EGL_GL_TEXTURE_2D_KHR, GL_RGB, GL_RGB, GL_UNSIGNED_BYTE);
addCreateTexture(prefix + "rgb565", EGL_GL_TEXTURE_2D_KHR, GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
addCreateTexture(prefix + "rgba8", EGL_GL_TEXTURE_2D_KHR, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE);
- addCreateTexture(prefix + "rgba5_a1", EGL_GL_TEXTURE_2D_KHR, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
+ addCreateTexture(prefix + "rgb5_a1", EGL_GL_TEXTURE_2D_KHR, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
addCreateTexture(prefix + "rgba4", EGL_GL_TEXTURE_2D_KHR, GL_RGBA, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
}
@@ -1505,7 +1505,7 @@
m_modifyActions.add("tex_subimage_rgb8", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGB, GL_UNSIGNED_BYTE)));
m_modifyActions.add("tex_subimage_rgb565", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGB, GL_UNSIGNED_SHORT_5_6_5)));
m_modifyActions.add("tex_subimage_rgba8", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGBA, GL_UNSIGNED_BYTE)));
- m_modifyActions.add("tex_subimage_rgba5_a1", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1)));
+ m_modifyActions.add("tex_subimage_rgb5_a1", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1)));
m_modifyActions.add("tex_subimage_rgba4", MovePtr<Action>(new GLES2ImageApi::ModifyTexSubImage(GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4)));
m_modifyActions.add("renderbuffer_clear_color", MovePtr<Action>(new GLES2ImageApi::ModifyRenderbufferClearColor(tcu::Vec4(0.3f, 0.5f, 0.3f, 1.0f))));
