[3/3] Move another test to ascertain whether a driver fails upon deletion of a mapped buffer object

Submitted by Guy-Daniel Tiku on April 2, 2015, 11:43 p.m.

Details

Message ID 1428018215-31630-3-git-send-email-guydany37@gmail.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Guy-Daniel Tiku April 2, 2015, 11:43 p.m.
---
 tests/bugs/CMakeLists.gl.txt                       |   1 -
 tests/bugs/fdo22540.c                              | 106 ---------------------
 .../arb_vertex_buffer_object/CMakeLists.gl.txt     |   1 +
 tests/spec/arb_vertex_buffer_object/fdo22540.c     | 106 +++++++++++++++++++++
 4 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 tests/bugs/fdo22540.c
 create mode 100644 tests/spec/arb_vertex_buffer_object/fdo22540.c

Patch hide | download patch | download mbox

diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 6481f82..39ebfa1 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -18,7 +18,6 @@  piglit_add_executable (r300-readcache r300-readcache.c)
 piglit_add_executable (tex1d-2dborder tex1d-2dborder.c)
 piglit_add_executable (fdo10370 fdo10370.c)
 piglit_add_executable (point-sprite point-sprite.c)
-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 6687ea3..0000000
--- a/tests/bugs/fdo22540.c
+++ /dev/null
@@ -1,106 +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;
-
-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 a1c4c8e..5500e98 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -15,5 +15,6 @@  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)
 piglit_add_executable (arb_vertex_buffer_object-vbo-subdata-many vbo-subdata-many.c)
 piglit_add_executable (fdo14575 fdo14575.c)
+piglit_add_executable (fdo22540 fdo22540.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_buffer_object/fdo22540.c b/tests/spec/arb_vertex_buffer_object/fdo22540.c
new file mode 100644
index 0000000..6687ea3
--- /dev/null
+++ b/tests/spec/arb_vertex_buffer_object/fdo22540.c
@@ -0,0 +1,106 @@ 
+/*
+ * 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;
+
+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();
+}