<div dir="ltr">On 12 August 2013 09:53, Nicholas Mack <span dir="ltr"><<a href="mailto:nichmack@gmail.com" target="_blank">nichmack@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
V2: Restructure the test into a loop to cycle through all buffers<br>
---<br>
tests/spec/gl-3.2/CMakeLists.gl.txt | 2 +-<br>
tests/spec/gl-3.2/get-integer-64iv.c | 125 +++++++++++++++++++++++++++++++++++<br>
2 files changed, 126 insertions(+), 1 deletion(-)<br>
create mode 100644 tests/spec/gl-3.2/get-integer-64iv.c<br>
<br>
diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt<br>
index bb0d008..2add6bf 100644<br>
--- a/tests/spec/gl-3.2/CMakeLists.gl.txt<br>
+++ b/tests/spec/gl-3.2/CMakeLists.gl.txt<br>
@@ -11,5 +11,5 @@ link_libraries (<br>
<br>
piglit_add_executable (gl-3.2-minmax minmax.c)<br>
piglit_add_executable (gl-3.2-get-buffer-parameter-i64v get-buffer-parameter-i64v.c)<br>
-<br>
+piglit_add_executable (gl-3.2-get-integer-64iv get-integer-64iv.c)<br></blockquote><div><br></div><div>Need to add this to all.tests.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
# vim: ft=cmake:<br>
diff --git a/tests/spec/gl-3.2/get-integer-64iv.c b/tests/spec/gl-3.2/get-integer-64iv.c<br>
new file mode 100644<br>
index 0000000..6af3727<br>
--- /dev/null<br>
+++ b/tests/spec/gl-3.2/get-integer-64iv.c<br>
@@ -0,0 +1,125 @@<br>
+/**<br>
+ * Copyright © 2013 Intel Corporation<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>
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,<br>
+ * and/or sell copies of the Software, and to permit persons to whom the<br>
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL<br>
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br>
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<br>
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS<br>
+ * IN THE SOFTWARE.<br>
+ */<br>
+<br>
+/**<br>
+ * Test GetInteger64i_v()<br>
+ *<br>
+ * GL 3.2 core spec added GetInteger64i_v() in section 6.1.1(Simple Queries)<br>
+ *<br>
+ * GetInteger64i_v() queries an int64 value corresponding to the size or<br>
+ * offset of the target buffer<br>
+ *<br>
+ */<br>
+<br>
+#include "piglit-util-gl-common.h"<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_BEGIN<br>
+<br>
+ config.supports_gl_core_version = 32;<br>
+ config.supports_gl_compat_version = 32;<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_END<br>
+<br>
+enum piglit_result<br>
+piglit_display(void)<br>
+{<br>
+ /* UNREACHED */<br>
+ return PIGLIT_FAIL;<br>
+}<br>
+<br>
+static const struct {<br>
+ GLenum target, start, size;<br>
+} test_vectors[] = {<br>
+ {<br>
+ GL_UNIFORM_BUFFER,<br>
+ GL_UNIFORM_BUFFER_START,<br>
+ GL_UNIFORM_BUFFER_SIZE<br>
+ },<br>
+ {<br>
+ GL_TRANSFORM_FEEDBACK_BUFFER,<br>
+ GL_TRANSFORM_FEEDBACK_BUFFER_START,<br>
+ GL_TRANSFORM_FEEDBACK_BUFFER_SIZE<br>
+ }<br></blockquote><div><br></div><div>The mix of spaces and tabs here looks weird. Our normal practice would be to simply indent the lines beginning with "GL_" with two tabs.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+};<br>
+<br>
+GLint64 data = -2;<br>
+<br>
+int size = 3 * sizeof(int);<br>
+int offset = 0;<br>
+<br>
+int stuff[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};<br>
+int sz = sizeof(stuff);<br>
+<br>
+GLuint idx = 0;<br>
+GLuint buff = 0;<br>
+<br>
+bool DoTest(GLuint buf, GLenum target, GLenum targStart, GLenum targSize) {<br></blockquote><div><br></div><div>Normally we put the opening brace on its own line for functions.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+ bool pass = true;<br>
+<br>
+ glBindBuffer(target, buf);<br>
+ glBufferData(target, sz, stuff, GL_STATIC_READ);<br>
+ glBindBufferRange(target, idx, buf, offset, size);<br>
+<br>
+ glGetInteger64i_v(targStart, idx, &data);<br>
+ if(data != offset) {<br>
+ printf("%s was expected to be %d, but %d "<br>
+ "was returned.\n",<br>
+ piglit_get_gl_enum_name(target),<br>
+ offset, (int)data);<br>
+ pass = false;<br>
+ }<br>
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+ glGetInteger64i_v(targSize, idx, &data);<br>
+ if(data != size) {<br>
+ printf("%s was expected to be %d, but %d "<br>
+ "was returned.\n",<br>
+ piglit_get_gl_enum_name(target),<br>
+ size, (int)data);<br>
+ pass = false;<br>
+ }<br>
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+ return pass;<br>
+}<br>
+<br>
+void<br>
+piglit_init(int argc, char **argv)<br>
+{<br>
+ bool pass = true;<br>
+ int i = 0;<br>
+<br>
+ glGenBuffers(1, &buff);<br>
+<br>
+ for (i = 0; i < ARRAY_SIZE(test_vectors); i++) {<br>
+ pass = DoTest(buff,<br>
+ test_vectors[i].target,<br>
+ test_vectors[i].start,<br>
+ test_vectors[i].size)<br>
+ && pass;<br>
+ }<br></blockquote><div><br></div><div>Looping through an array to test just two cases seems like more trouble than it's worth. I would just do:<br><br></div> pass = DoTest(buff, GL_UNIFORM_BUFFER, GL_UNIFORM_BUFFER_START,<br>
GL_UNIFORM_BUFFER_SIZE) && pass;<br> pass = DoTest(buff, GL_TRANSFORM_FEEDBACK_BUFFER,<br> GL_TRANSFORM_FEEDBACK_BUFFER_START,<br> GL_TRANSFORM_FEEDBACK_BUFFER_SIZE) && pass;<br>
<br></div><div class="gmail_quote">But I admit this is a nit-pick.<br></div><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+<br>
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;<br>
+<br>
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);<br>
+}<br>
<span class=""><font color="#888888">--<br>
1.8.3.1<br></font></span></blockquote><div><br></div><div>With the spaces/tabs fixed, and the test added to all.tests, this patch is:<br><br>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br>
</div></div></div></div>