summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2018-08-31 00:19:53 -0700
committerIan Romanick <ian.d.romanick@intel.com>2018-09-04 13:07:40 -0700
commit1705d821ad52e27080c3c6c28286974b1141f0c2 (patch)
treeff56010212cdb18aabf1f98effde2b2519f83e1e
parentfc2e97fc2f2c18cb1fc4539811641117cfe2e4ae (diff)
arb_vertex_array_object: Add test for deleting object zero
As of commit 781a78914c7, this test fails with: arb_vertex_array-delete-object-0: src/mesa/main/hash.c:240: _mesa_HashRemove_unlocked: Assertion `key' failed. Aborted (core dumped) Marek already has a patch on the Mesa list for this issue. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r--tests/opengl.py1
-rw-r--r--tests/spec/arb_vertex_array_object/CMakeLists.gl.txt1
-rw-r--r--tests/spec/arb_vertex_array_object/delete-object-0.c71
3 files changed, 73 insertions, 0 deletions
diff --git a/tests/opengl.py b/tests/opengl.py
index 820b5a5f1..9414c405e 100644
--- a/tests/opengl.py
+++ b/tests/opengl.py
@@ -2667,6 +2667,7 @@ with profile.test_list.group_manager(
PiglitGLTest,
grouptools.join('spec', 'arb_vertex_array_object')) as g:
g(['vao-element-array-buffer'])
+ g(['arb_vertex_array-delete-object-0'], 'delete-object-0')
g(['arb_vertex_array-isvertexarray'], 'isvertexarray')
with profile.test_list.group_manager(
diff --git a/tests/spec/arb_vertex_array_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_array_object/CMakeLists.gl.txt
index 836ac5288..16d69c970 100644
--- a/tests/spec/arb_vertex_array_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_array_object/CMakeLists.gl.txt
@@ -8,6 +8,7 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
+piglit_add_executable (arb_vertex_array-delete-object-0 delete-object-0.c)
piglit_add_executable (arb_vertex_array-isvertexarray isvertexarray.c)
# vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_array_object/delete-object-0.c b/tests/spec/arb_vertex_array_object/delete-object-0.c
new file mode 100644
index 000000000..3fb5d8132
--- /dev/null
+++ b/tests/spec/arb_vertex_array_object/delete-object-0.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2018 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.
+ */
+
+#include "piglit-util-gl.h"
+
+/**
+ * @file delete-object-0.c
+ *
+ * The OpenGL 4.6 Core Profile specification (dated May 14, 2018) says:
+ *
+ * Unused names in arrays that have been marked as used for the purposes of
+ * GenVertexArrays are marked as unused again. Unused names in arrays are
+ * silently ignored, as is the value zero.
+ *
+ * This test verifies the no errors are generated for 0 or for names from
+ * glGenVertexArrays that have not been bound.
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+ /* UNREACHED */
+ return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLuint id[3] = { 0, 0, 0 };
+ bool pass = true;
+
+ piglit_require_gl_version(15);
+ piglit_require_extension("GL_ARB_vertex_array_object");
+
+ /* After this call to Gen, the id array will contain { 0, id1, id2 }. */
+ glGenVertexArrays(2, &id[1]);
+ glBindVertexArray(id[1]);
+ glBindVertexArray(0);
+
+ glDeleteVertexArrays(3, id);
+
+ pass = piglit_check_gl_error(GL_NO_ERROR);
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}