<div dir="ltr"><div>LGTM.<br><br></div>Reviewed-by: Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 31, 2015 at 10:26 AM, Fredrik Höglund <span dir="ltr"><<a href="mailto:fredrik@kde.org" target="_blank">fredrik@kde.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This test verifies that glCreateVertexArrays works as expected.<br>
---<br>
 tests/all.py                                       |   1 +<br>
 .../spec/arb_direct_state_access/CMakeLists.gl.txt |   1 +<br>
 tests/spec/arb_direct_state_access/vao-create.c    | 143 +++++++++++++++++++++<br>
 3 files changed, 145 insertions(+)<br>
 create mode 100644 tests/spec/arb_direct_state_access/vao-create.c<br>
<br>
diff --git a/tests/all.py b/tests/all.py<br>
index d0815da..441ea77 100755<br>
--- a/tests/all.py<br>
+++ b/tests/all.py<br>
@@ -4280,6 +4280,7 @@ with profile.group_manager(<br>
     g(['arb_direct_state_access-create-programpipelines'],<br>
       'create-programpipelines')<br>
     g(['arb_direct_state_access-create-queries'], 'create-queries')<br>
+    g(['arb_direct_state_access-vao-create'], 'vao-create')<br>
<br>
 with profile.group_manager(<br>
         PiglitGLTest,<br>
diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt<br>
index a5ae423..9fcbf7e 100644<br>
--- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt<br>
+++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt<br>
@@ -36,4 +36,5 @@ piglit_add_executable (arb_direct_state_access-texture-buffer texture-buffer.c)<br>
 piglit_add_executable (arb_direct_state_access-create-samplers create-samplers.c)<br>
 piglit_add_executable (arb_direct_state_access-create-programpipelines create-programpipelines.c)<br>
 piglit_add_executable (arb_direct_state_access-create-queries create-queries.c)<br>
+piglit_add_executable (arb_direct_state_access-vao-create vao-create.c)<br>
 # vim: ft=cmake:<br>
diff --git a/tests/spec/arb_direct_state_access/vao-create.c b/tests/spec/arb_direct_state_access/vao-create.c<br>
new file mode 100644<br>
index 0000000..1a124e7<br>
--- /dev/null<br>
+++ b/tests/spec/arb_direct_state_access/vao-create.c<br>
@@ -0,0 +1,143 @@<br>
+/*<br>
+ * Copyright (C) 2015 Fredrik Höglund<br>
+ *<br>
+ * Permission is hereby granted, free of charge, to any person obtaining a<br>
+ * copy of this software and associated documentation files (the "Software"),<br>
+ * to deal in the Software without restriction, including without limitation<br>
+ * on the rights to use, copy, modify, merge, publish, distribute, sub<br>
+ * license, and/or sell copies of the Software, and to permit persons to whom<br>
+ * the Software is furnished to do so, subject to the following conditions:<br>
+ *<br>
+ * The above copyright notice and this permission notice (including the next<br>
+ * paragraph) shall be included in all copies or substantial portions of the<br>
+ * Software.<br>
+ *<br>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br>
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br>
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL<br>
+ * THE AUTHORS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,<br>
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR<br>
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE<br>
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
+ */<br>
+<br>
+/**<br>
+ * @file vao-create.c<br>
+ *<br>
+ * Verifies that glCreateVertexArrays works as expected.<br>
+ */<br>
+<br>
+#include "piglit-util-gl.h"<br>
+<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_BEGIN<br>
+<br>
+       config.supports_gl_core_version = 32;<br>
+       config.supports_gl_compat_version = 20;<br>
+<br>
+       config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_END<br>
+<br>
+<br>
+enum piglit_result<br>
+piglit_display(void)<br>
+{<br>
+       /* unreached */<br>
+       return PIGLIT_FAIL;<br>
+}<br>
+<br>
+<br>
+/**<br>
+ * Returns true if expected is bound as the current VAO,<br>
+ * and false otherwise.<br>
+ */<br>
+static bool<br>
+check_vao_binding_(GLuint expected, int line)<br>
+{<br>
+       GLuint binding;<br>
+       glGetIntegerv(GL_VERTEX_ARRAY_BINDING, (GLint *) &binding);<br>
+<br>
+       if (binding != expected) {<br>
+               fprintf(stderr, "GL_VERTEX_ARRAY_BINDING "<br>
+                       "was %u, expected %u (%s:%d)\n",<br>
+                       binding, expected, __FILE__, line);<br>
+               return false;<br>
+       }<br>
+<br>
+       return true;<br>
+}<br>
+<br>
+<br>
+#define check_vao_binding(expected) \<br>
+       check_vao_binding_(expected, __LINE__)<br>
+<br>
+<br>
+void<br>
+piglit_init(int argc, char *argv[])<br>
+{<br>
+       GLuint vaos[4];<br>
+       bool pass = true;<br>
+       int i;<br>
+<br>
+       piglit_require_extension("GL_ARB_direct_state_access");<br>
+       piglit_require_extension("GL_ARB_vertex_array_object");<br>
+<br>
+       /* Page 332 of the PDF of the OpenGL 4.5 (Core Profile) spec says:<br>
+        *<br>
+        * "CreateVertexArrays returns n previously unused vertex array object<br>
+        *  names in arrays, each representing a state vector comprising all<br>
+        *  the state and with the same initial values listed in tables 23.3<br>
+        *  and 23.4."<br>
+        */<br>
+       glCreateVertexArrays(4, vaos);<br>
+       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+       /* Verify that the arrays were created */<br>
+       for (i = 0; i < 4; i++)<br>
+               pass = glIsVertexArray(vaos[i]) && pass;<br>
+<br>
+       /* Bind the first vao and verify that it was bound */<br>
+       glBindVertexArray(vaos[0]);<br>
+       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+       pass = check_vao_binding(vaos[0]) && pass;<br>
+<br>
+       /* Page 331 of the PDF of the OpenGL 4.5 (Core Profile) spec says:<br>
+        *<br>
+        * "If a vertex array object that is currently bound is deleted,<br>
+        *  the binding for that object reverts to zero and no vertex array<br>
+        *  object is bound."<br>
+        */<br>
+       glDeleteVertexArrays(4, vaos);<br>
+       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+       pass = check_vao_binding(0) && pass;<br>
+<br>
+       /* Verify that the arrays are no longer valid */<br>
+       for (i = 0; i < 4; i++)<br>
+               pass = !glIsVertexArray(vaos[i]) && pass;<br>
+<br>
+       /* Page 331 of the PDF of the OpenGL 4.5 (Core Profile) spec says:<br>
+        *<br>
+        * "Unused names in arrays are silently ignored, as is the value zero."<br>
+        */<br>
+       vaos[0] = 0;<br>
+       glDeleteVertexArrays(4, vaos);<br>
+       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+       /* Page 332 of the PDF of the OpenGL 4.5 (Core Profile) spec says:<br>
+        *<br>
+        * "An INVALID_VALUE error is generated if n is negative."<br>
+        */<br>
+       glCreateVertexArrays(-1, vaos);<br>
+       pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;<br>
+<br>
+       /* Page 331 of the PDF of the OpenGL 4.5 (Core Profile) spec says:<br>
+        *<br>
+        * "An INVALID_VALUE error is generated if n is negative."<br>
+        */<br>
+       glDeleteVertexArrays(-1, vaos);<br>
+       pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;<br>
+<br>
+       piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);<br>
+}<br>
+<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br></div>