[Piglit] [PATCH v2 4/7] Test GL_ARB_clear_texture using depth-stencil textures

Neil Roberts neil at linux.intel.com
Thu Jun 5 09:38:26 PDT 2014


This adds a test for glClearTexSubImage when clearing a sub-region of
a depth-stencil texture. 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   | 70 ++++++++++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 tests/spec/arb_clear_texture/depth-stencil.c

diff --git a/tests/all.py b/tests/all.py
index 099a647..e12c88b 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3062,6 +3062,7 @@ 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-base-formats')
+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 e01de84..29d166f 100644
--- a/tests/spec/arb_clear_texture/CMakeLists.gl.txt
+++ b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
@@ -12,5 +12,6 @@ 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-base-formats base-formats.c common.c)
+piglit_add_executable (arb_clear_texture-depth-stencil depth-stencil.c common.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..999341e
--- /dev/null
+++ b/tests/spec/arb_clear_texture/depth-stencil.c
@@ -0,0 +1,70 @@
+/*
+ * 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 depth-stencil.c
+ *
+ * A test of using glClearTexSubImage to clear a depth-stencil
+ * texture.
+ */
+
+#include "common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 13;
+
+	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass;
+
+        /* We can create depth/stencil textures if either:
+         * 1. We have GL 3.0 or later
+         * 2. We have GL_EXT_packed_depth_stencil and GL_ARB_depth_texture
+         */
+	if (piglit_get_gl_version() < 30
+	    && !(piglit_is_extension_supported("GL_EXT_packed_depth_stencil") &&
+		 piglit_is_extension_supported("GL_ARB_depth_texture"))) {
+		printf("OpenGL 3.0 or GL_EXT_packed_depth_stencil + "
+		       "GL_ARB_depth_texture is required.\n");
+		piglit_report_result(PIGLIT_SKIP);
+	}
+
+	pass = test_format(GL_DEPTH24_STENCIL8_EXT,
+			   GL_DEPTH_STENCIL_EXT,
+			   GL_UNSIGNED_INT_24_8_EXT,
+			   4);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* unused */
+	return PIGLIT_FAIL;
+}
-- 
1.9.0



More information about the Piglit mailing list