Now it's called "map-after-draw".
---
tests/all.py | 2 +-
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/fdo22540.c | 107 -------------------
.../arb_vertex_buffer_object/CMakeLists.gl.txt | 1 +
.../spec/arb_vertex_buffer_object/map-after-draw.c | 113 +++++++++++++++++++++
5 files changed, 115 insertions(+), 109 deletions(-)
delete mode 100644 tests/bugs/fdo22540.c
create mode 100644 tests/spec/arb_vertex_buffer_object/map-after-draw.c
diff --git a/tests/all.py b/tests/all.py
index 6cafc11..c7baf7d 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2725,7 +2725,7 @@ with profile.test_list.group_manager(
g(['arb_vertex_buffer_object-mixed-immediate-and-vbo'],
'mixed-immediate-and-vbo')
g(['arb_vertex_buffer_object-delete-mapped-buffer'])
- g(['fdo22540'])
+ g(['arb_vertex_buffer_object-map-after-draw'])
g(['fdo31934'])
g(['arb_vertex_buffer_object-ib-data-sync'], 'ib-data-sync')
g(['arb_vertex_buffer_object-ib-subdata-sync'], 'ib-subdata-sync')
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 4cc651c..e424d9a 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 (fdo22540 fdo22540.c)
piglit_add_executable (fdo23489 fdo23489.c)
piglit_add_executable (fdo23670-depth_test fdo23670-depth_test.c)
piglit_add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c
deleted file mode 100644
index f8f1db4..0000000
--- a/tests/bugs/fdo22540.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright © 2009 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.
- */
-
-// author: Ben Holmes
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = 400;
- config.window_height = 300;
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
- config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static GLuint vBuffer;
-
-static void
-Init(void)
-{
- piglit_require_extension("GL_ARB_vertex_buffer_object");
- glMatrixMode(GL_PROJECTION);
- glPushMatrix();
- glLoadIdentity();
- glOrtho(0, 400, 0, 300, -1, 1);
-
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glLoadIdentity();
-}
-
-static void
-vboInit(void)
-{
- static const GLfloat vArray[12] = {
- 225, 125, 0,
- 225, 175, 0,
- 175, 125, 0,
- 175, 175, 0
- };
- glGenBuffersARB(1, &vBuffer);
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, vBuffer);
- glBufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(vArray),
- vArray, GL_STATIC_DRAW_ARB);
-
-}
-
-static GLboolean
-vboMap(void)
-{
- (void) glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB);
- glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
- return (glGetError() == 0);
-}
-
-enum piglit_result
-piglit_display(void)
-{
- GLfloat gray[3] = {0.5, 0.5, 0.5};
- GLboolean pass;
-
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, vBuffer);
- glEnableClientState(GL_VERTEX_ARRAY);
- glVertexPointer(3, GL_FLOAT, 0 ,0);
-
- glColor3f(0.5, 0.5, 0.5);
- glClear(GL_COLOR_BUFFER_BIT);
- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
- pass = vboMap();
- pass = pass && piglit_probe_pixel_rgb(200, 150, gray);
-
- glFinish();
- piglit_present_results();
-
- return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- Init();
- vboInit();
-}
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index 8b6f3b2..d671b67 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -11,6 +11,7 @@ link_libraries (
piglit_add_executable (arb_vertex_buffer_object-combined-vertex-index
combined-vertex-index.c)
piglit_add_executable (arb_vertex_buffer_object-delete-mapped-buffer
delete-mapped-buffer.c)
piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset
elements-negative-offset.c)
+piglit_add_executable (arb_vertex_buffer_object-map-after-draw
map-after-draw.c)
piglit_add_executable (arb_vertex_buffer_object-mixed-immediate-and-vbo
mixed-immediate-and-vbo.c)
piglit_add_executable (arb_vertex_buffer_object-ib-data-sync ib-data-sync.c)
piglit_add_executable (arb_vertex_buffer_object-ib-subdata-sync
ib-subdata-sync.c)
diff --git a/tests/spec/arb_vertex_buffer_object/map-after-draw.c
b/tests/spec/arb_vertex_buffer_object/map-after-draw.c
new file mode 100644
index 0000000..b6d74f2
--- /dev/null
+++ b/tests/spec/arb_vertex_buffer_object/map-after-draw.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2009 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.
+ */
+
+/*
+ * author: Ben Holmes
+ *
+ * Map vbo after drawing from it.
+ *
+ * https://bugs.freedesktop.org/show_bug.cgi?id=22540
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = 400;
+ config.window_height = 300;
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static GLuint vBuffer;
+
+static void
+Init(void)
+{
+ piglit_require_extension("GL_ARB_vertex_buffer_object");
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glOrtho(0, 400, 0, 300, -1, 1);
+
+ glMatrixMode(GL_MODELVIEW);
+ glPushMatrix();
+ glLoadIdentity();
+}
+
+static void
+vboInit(void)
+{
+ static const GLfloat vArray[12] = {
+ 225, 125, 0,
+ 225, 175, 0,
+ 175, 125, 0,
+ 175, 175, 0
+ };
+ glGenBuffersARB(1, &vBuffer);
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, vBuffer);
+ glBufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(vArray),
+ vArray, GL_STATIC_DRAW_ARB);
+
+}
+
+static GLboolean
+vboMap(void)
+{
+ (void) glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB);
+ glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
+ return (glGetError() == 0);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ GLfloat gray[3] = {0.5, 0.5, 0.5};
+ GLboolean pass;
+
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, vBuffer);
+ glEnableClientState(GL_VERTEX_ARRAY);
+ glVertexPointer(3, GL_FLOAT, 0 ,0);
+
+ glColor3f(0.5, 0.5, 0.5);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+ pass = vboMap();
+ pass = pass && piglit_probe_pixel_rgb(200, 150, gray);
+
+ glFinish();
+ piglit_present_results();
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ Init();
+ vboInit();
+}
--
2.7.4
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
