[Piglit] [PATCH 7/8] OES_compressed_ETC1_RGB8_texture-basic: fix glCopyTexImage2D error check

Daniel Kurtz djkurtz at chromium.org
Mon Jan 6 08:02:42 PST 2014


According to OpenGL ES 1.1 [0] and  OpenGL ES 2.0 [1], for
glCopyTexImage2D:

GL_INVALID_ENUM is generated if internalformat is not an accepted constant.

[0] http://www.khronos.org/opengles/sdk/1.1/docs/man/glCopyTexImage2D.xml
[1] http://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml

Note: This is *different* than OpenGL [2] and OpenGL ES 3.0 [3], which
both specify:
GL_INVALID_VALUE is generated if internalformat is not an accepted format.

[2] http://www.opengl.org/sdk/docs/man/xhtml/glCopyTexImage2D.xml
[3] http://www.khronos.org/opengles/sdk/docs/man3/xhtml/glCopyTexImage2D.xml

Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
---
 .../oes_compressed_etc1_rgb8_texture-basic.c                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c
index 028b738..e1ec139 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c
@@ -70,7 +70,11 @@ piglit_display(void)
     pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
 
     glCopyTexImage2D(GL_TEXTURE_2D, 0, format, 0, 0, width, height, 0);
+#if defined(PIGLIT_USE_OPENGL) || defined(PIGLIT_USE_OPENGL_ES3)
     pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+#else  /* defined(PIGLIT_USE_OPENGL_ES1) || defined(PIGLIT_USE_OPENGL_ES2) */
+    pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+#endif
 
     /* From the GL_OES_compressed_ETC1_RGB8_texture spec:
      *
-- 
1.8.5.1



More information about the Piglit mailing list