From: guy-D <[email protected]>
---
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/crash-cubemap-order.c | 51 ----------------------
tests/spec/CMakeLists.txt | 1 +
.../arb_texture_cube_map_order/CMakeLists.gl.txt | 14 ++++++
.../spec/arb_texture_cube_map_order/CMakeLists.txt | 1 +
.../crash-cubemap-order.c | 51 ++++++++++++++++++++++
6 files changed, 67 insertions(+), 52 deletions(-)
delete mode 100644 tests/bugs/crash-cubemap-order.c
create mode 100644 tests/spec/arb_texture_cube_map_order/CMakeLists.gl.txt
create mode 100644 tests/spec/arb_texture_cube_map_order/CMakeLists.txt
create mode 100644 tests/spec/arb_texture_cube_map_order/crash-cubemap-order.c
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index e24ec6b..322232e 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_glu_LIBRARY}
)
-piglit_add_executable (crash-cubemap-order crash-cubemap-order.c)
piglit_add_executable (crash-texparameter-before-teximage
crash-texparameter-before-teximage.c)
piglit_add_executable (drawbuffer-modes drawbuffer-modes.c)
piglit_add_executable (fdo10370 fdo10370.c)
diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c
deleted file mode 100644
index c6b3882..0000000
--- a/tests/bugs/crash-cubemap-order.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file crash-cubemap-order.c
- *
- * Test case for "crash if cubemap faces are loaded in an unusual order".
- *
- * This bug existed in the R300 driver and was triggered by Sauerbraten.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result
-piglit_display(void)
-{
- return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- GLubyte data[4096]; /* 32*32*4 */
-
- piglit_require_extension("GL_ARB_texture_cube_map");
-
- memset(data, 0, sizeof(data));
-
- glViewport(0, 0, piglit_width, piglit_height);
-
- glBindTexture(GL_TEXTURE_CUBE_MAP, 1);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
-
- glBindTexture(GL_TEXTURE_CUBE_MAP, 2);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
- glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
-}
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index d921df4..0e39bec 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -55,6 +55,7 @@ add_subdirectory (arb_texture_buffer_object)
add_subdirectory (arb_texture_buffer_range)
add_subdirectory (arb_texture_compression)
add_subdirectory (arb_texture_cube_map_array)
+add_subdirectory (arb_texture_cube_map_order)
add_subdirectory (arb_texture_float)
add_subdirectory (arb_texture_rectangle)
add_subdirectory (arb_texture_multisample)
diff --git a/tests/spec/arb_texture_cube_map_order/CMakeLists.gl.txt
b/tests/spec/arb_texture_cube_map_order/CMakeLists.gl.txt
new file mode 100644
index 0000000..2dc1c20
--- /dev/null
+++ b/tests/spec/arb_texture_cube_map_order/CMakeLists.gl.txt
@@ -0,0 +1,14 @@
+include_directories(
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+ piglitutil_${piglit_target_api}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+)
+
+piglit_add_executable (crash-cubemap-order crash-cubemap-order.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_texture_cube_map_order/CMakeLists.txt
b/tests/spec/arb_texture_cube_map_order/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/arb_texture_cube_map_order/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_texture_cube_map_order/crash-cubemap-order.c
b/tests/spec/arb_texture_cube_map_order/crash-cubemap-order.c
new file mode 100644
index 0000000..c6b3882
--- /dev/null
+++ b/tests/spec/arb_texture_cube_map_order/crash-cubemap-order.c
@@ -0,0 +1,51 @@
+/**
+ * @file crash-cubemap-order.c
+ *
+ * Test case for "crash if cubemap faces are loaded in an unusual order".
+ *
+ * This bug existed in the R300 driver and was triggered by Sauerbraten.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+ return PIGLIT_PASS;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLubyte data[4096]; /* 32*32*4 */
+
+ piglit_require_extension("GL_ARB_texture_cube_map");
+
+ memset(data, 0, sizeof(data));
+
+ glViewport(0, 0, piglit_width, piglit_height);
+
+ glBindTexture(GL_TEXTURE_CUBE_MAP, 1);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
+
+ glBindTexture(GL_TEXTURE_CUBE_MAP, 2);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+ glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, GL_RGBA, 32, 32, 0,
GL_RGBA, GL_UNSIGNED_BYTE, 0);
+}
--
2.1.0
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
