Now it's called "get-limits-without-fp".
---
tests/all.py | 2 +-
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/fdo24066.c | 75 ---------------------
tests/spec/arb_vertex_program/CMakeLists.gl.txt | 1 +
.../arb_vertex_program/get-limits-without-fp.c | 78 ++++++++++++++++++++++
5 files changed, 80 insertions(+), 77 deletions(-)
delete mode 100644 tests/bugs/fdo24066.c
create mode 100644 tests/spec/arb_vertex_program/get-limits-without-fp.c
diff --git a/tests/all.py b/tests/all.py
index 02aa5af..360d7ee 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2756,7 +2756,7 @@ with profile.test_list.group_manager(
g(['arb_vertex_program-matrix-property-bindings'])
g(['arb_vertex_program-minmax'], 'minmax')
g(['arb_vertex_program-property-bindings'])
- g(['fdo24066'], run_concurrent=False)
+ g(['arb_vertex_program-get-limits-without-fp'], run_concurrent=False)
g(['vp-address-01'], run_concurrent=False)
g(['vp-address-02'], run_concurrent=False)
g(['vp-address-04'], run_concurrent=False)
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index cc9be92..e50e401 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
-piglit_add_executable (fdo24066 fdo24066.c)
piglit_add_executable (fdo25614-genmipmap fdo25614-genmipmap.c)
piglit_add_executable (fdo28551 fdo28551.c)
piglit_add_executable (fdo31934 fdo31934.c)
diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c
deleted file mode 100644
index 42400d3..0000000
--- a/tests/bugs/fdo24066.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009 Nicolai Hähnle
- *
- * 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.
- *
- * Authors:
- * Nicolai Hähnle <nhaeh...@gmail.com>
- *
- */
-
-/**
- * \file
- * Test for the crash reported in bugs.freedesktop.org bug #24066.
- * This occured when the native limits of a vertex program are queried
- * before a fragment program has been setup.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_visual = PIGLIT_GL_VISUAL_RGB;
- config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result piglit_display(void)
-{
- return PIGLIT_PASS;
-}
-
-
-static const char program_text[] =
- "!!ARBvp1.0\n"
- "MOV result.position, vertex.position;\n"
- "END";
-
-void piglit_init(int argc, char ** argv)
-{
- GLuint program_object;
- GLint result;
-
- (void) argc;
- (void) argv;
-
- piglit_require_vertex_program();
-
- program_object = piglit_compile_program(GL_VERTEX_PROGRAM_ARB,
program_text);
-
- glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_object);
-
- printf("Testing whether the following call crashes...\n");
- glGetProgramivARB(GL_VERTEX_PROGRAM_ARB,
GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &result);
-
- piglit_report_result(PIGLIT_PASS);
-}
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
index 537bd35..d52b565 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -8,6 +8,7 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
+piglit_add_executable (arb_vertex_program-get-limits-without-fp
get-limits-without-fp.c)
piglit_add_executable (arb_vertex_program-getenv4d-with-error
getenv4d-with-error.c)
piglit_add_executable (arb_vertex_program-getlocal4d-with-error
getlocal4d-with-error.c)
piglit_add_executable (arb_vertex_program-getlocal4f-max getlocal4f-max.c)
diff --git a/tests/spec/arb_vertex_program/get-limits-without-fp.c
b/tests/spec/arb_vertex_program/get-limits-without-fp.c
new file mode 100644
index 0000000..d4f2b3e
--- /dev/null
+++ b/tests/spec/arb_vertex_program/get-limits-without-fp.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2009 Nicolai Hähnle
+ *
+ * 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.
+ *
+ * Authors:
+ * Nicolai Hähnle <nhaeh...@gmail.com>
+ *
+ */
+
+/**
+ * \file get-vp-limit-without-fp.c
+ *
+ * Test for the crash reported in bugs.freedesktop.org bug #24066.
+ * This occured when the native limits of a vertex program are queried
+ * before a fragment program has been setup.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_visual = PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result piglit_display(void)
+{
+ return PIGLIT_PASS;
+}
+
+
+static const char program_text[] =
+ "!!ARBvp1.0\n"
+ "MOV result.position, vertex.position;\n"
+ "END";
+
+void piglit_init(int argc, char ** argv)
+{
+ GLuint program_object;
+ GLint result;
+
+ (void) argc;
+ (void) argv;
+
+ piglit_require_vertex_program();
+
+ program_object =
+ piglit_compile_program(GL_VERTEX_PROGRAM_ARB, program_text);
+
+ glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_object);
+
+ printf("Testing whether the following call crashes...\n");
+ glGetProgramivARB(GL_VERTEX_PROGRAM_ARB,
+ GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &result);
+
+ piglit_report_result(PIGLIT_PASS);
+}
--
2.7.4
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
