[Mesa-dev] [PATCH piglit 3/3] Test GL_ARB_clear_texture using depth-stencil textures

Neil Roberts neil at linux.intel.com
Wed Jun 4 11:13:30 PDT 2014


This adds a test for glClearTexSubImage when clearing a sub-region of
a depth-stencil texture. A 2x2 texture is created and then two pixels
of it are cleared using different values. The texture is then read
back using glGetTexImage and compared with the expected values.

This is important to test because it hits a separate code path in
Mesa.
---
 tests/all.py                                   |   1 +
 tests/spec/arb_clear_texture/CMakeLists.gl.txt |   1 +
 tests/spec/arb_clear_texture/depth-stencil.c   | 148 +++++++++++++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 tests/spec/arb_clear_texture/depth-stencil.c

diff --git a/tests/all.py b/tests/all.py
index cb72677..b5dc864 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3036,6 +3036,7 @@ spec['ARB_clear_texture'] = arb_clear_texture
 add_concurrent_test(arb_clear_texture, 'arb_clear_texture-simple')
 add_concurrent_test(arb_clear_texture, 'arb_clear_texture-3d')
 add_concurrent_test(arb_clear_texture, 'arb_clear_texture-cube')
+add_concurrent_test(arb_clear_texture, 'arb_clear_texture-depth-stencil')
 
 arb_copy_buffer = {}
 spec['ARB_copy_buffer'] = arb_copy_buffer
diff --git a/tests/spec/arb_clear_texture/CMakeLists.gl.txt b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
index 697e84f..b9c45f5 100644
--- a/tests/spec/arb_clear_texture/CMakeLists.gl.txt
+++ b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
@@ -11,5 +11,6 @@ link_libraries (
 piglit_add_executable (arb_clear_texture-simple simple.c)
 piglit_add_executable (arb_clear_texture-3d 3d.c)
 piglit_add_executable (arb_clear_texture-cube cube.c)
+piglit_add_executable (arb_clear_texture-depth-stencil depth-stencil.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_clear_texture/depth-stencil.c b/tests/spec/arb_clear_texture/depth-stencil.c
new file mode 100644
index 0000000..1531e90
--- /dev/null
+++ b/tests/spec/arb_clear_texture/depth-stencil.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/** @file cube.c
+ *
+ * A test of using glClearTexSubImage to clear a depth-stencil
+ * texture. A 4x4 depth-stencil is created and then two of the texels
+ * are cleared using different values. The whole texture is read back
+ * using glGetTexImage and compared to the expected values.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 13;
+
+	config.window_width = 8;
+	config.window_height = 8;
+	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+	piglit_require_extension("GL_ARB_clear_texture");
+	piglit_require_extension("GL_ARB_depth_texture");
+	piglit_require_extension("GL_EXT_packed_depth_stencil");
+}
+
+static GLuint
+create_texture(void)
+{
+	static const GLubyte data[] = {
+		0xff, 0xff, 0xff, 0xff,
+		0x04, 0x05, 0x06, 0x07,
+		0xff, 0xff, 0xff, 0xff,
+		0x0c, 0x0d, 0x0e, 0x0f,
+	};
+	GLuint tex;
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_2D, tex);
+	glTexImage2D(GL_TEXTURE_2D,
+		     0, /* level */
+		     GL_DEPTH24_STENCIL8_EXT,
+		     2, 2, /* width/height */
+		     0, /* border */
+		     GL_DEPTH_STENCIL_EXT,
+		     GL_UNSIGNED_INT_24_8_EXT,
+		     data);
+
+	return tex;
+}
+
+static void
+clear_texture(GLuint tex)
+{
+	static const GLubyte bottom_left_pixel[] = {
+		0x00, 0x01, 0x02, 0x03
+	};
+	static const GLubyte top_left_pixel[] = {
+		0x08, 0x09, 0x0a, 0x0b
+	};
+	glClearTexSubImage(tex,
+			   0, /* level */
+			   0, 0, 0, /* x/y/z */
+			   1, 1, 1, /* width/height/depth */
+			   GL_DEPTH_STENCIL_EXT,
+			   GL_UNSIGNED_INT_24_8_EXT,
+			   bottom_left_pixel);
+	glClearTexSubImage(tex,
+			   0, /* level */
+			   0, 1, 0, /* x/y/z */
+			   1, 1, 1, /* width/height/depth */
+			   GL_DEPTH_STENCIL_EXT,
+			   GL_UNSIGNED_INT_24_8_EXT,
+			   top_left_pixel);
+}
+
+static bool
+check_texels(void)
+{
+	GLubyte texels[2 * 2 * 4];
+	int i;
+
+	glGetTexImage(GL_TEXTURE_2D,
+		      0, /* level */
+		      GL_DEPTH_STENCIL_EXT,
+		      GL_UNSIGNED_INT_24_8_EXT,
+		      texels);
+
+	for (i = 0; i < sizeof texels; i++)
+		if (texels[i] != i)
+			return false;
+
+	return true;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	bool pass = true;
+	GLuint tex;
+
+	tex = create_texture ();
+
+	if (!piglit_check_gl_error(GL_NO_ERROR))
+		piglit_report_result(PIGLIT_FAIL);
+
+	clear_texture(tex);
+
+	if (!piglit_check_gl_error(GL_NO_ERROR))
+		piglit_report_result(PIGLIT_FAIL);
+
+	glBindTexture(GL_TEXTURE_2D, tex);
+
+	pass = check_texels();
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	glDeleteTextures(1, &tex);
+
+	piglit_present_results();
+
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
-- 
1.9.0



More information about the mesa-dev mailing list