<div dir="ltr">Same comments as on the previous patch, otherwise good :)<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 27, 2015 at 7:31 AM, Martin Peres <span dir="ltr"><<a href="mailto:martin.peres@linux.intel.com" target="_blank">martin.peres@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">v2: review from Tapani<br>
- add the copyright for Intel<br>
- add some documentation<br>
- set the minimum GL version to 2.0<br>
- use piglit_build_simple_program_unlinked<br>
<br>
</span>Reviewed-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>><br>
Acked-by: Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>><br>
<br>
v3:<br>
- rewrite the test for GL 3.1 core (Ilia)<br>
- do not hardcode the tolerance (Laura)<br>
- delete the copyright from vmware as none of the code is left<br>
- improve the cleanup at the end of the test<br>
<span class=""><br>
Signed-off-by: Martin Peres <<a href="mailto:martin.peres@linux.intel.com">martin.peres@linux.intel.com</a>><br>
---<br>
 tests/all.py                                       |   1 +<br>
 .../spec/arb_direct_state_access/CMakeLists.gl.txt |   1 +<br>
</span> .../transformfeedback-bufferrange.c                | 248 +++++++++++++++++++++<br>
 3 files changed, 250 insertions(+)<br>
<div><div class="h5"> create mode 100644 tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c<br>
<br>
diff --git a/tests/all.py b/tests/all.py<br>
index 3f6be98..31c65e4 100644<br>
--- a/tests/all.py<br>
+++ b/tests/all.py<br>
@@ -3998,6 +3998,7 @@ arb_shader_atomic_counters['respecify-buffer'] = PiglitGLTest(['arb_shader_atomi<br>
<br>
 spec['ARB_direct_state_access']['create-transformfeedbacks'] = PiglitGLTest(['arb_direct_state_access-create-transformfeedbacks'], run_concurrent=True)<br>
 spec['ARB_direct_state_access']['transformfeedback-bufferbase'] = PiglitGLTest(['arb_direct_state_access-transformfeedback-bufferbase'], run_concurrent=True)<br>
+spec['ARB_direct_state_access']['transformfeedback-bufferrange'] = PiglitGLTest(['arb_direct_state_access-transformfeedback-bufferrange'], run_concurrent=True)<br>
 spec['ARB_direct_state_access']['dsa-textures'] = PiglitGLTest(['arb_direct_state_access-dsa-textures'], run_concurrent=True)<br>
 spec['ARB_direct_state_access']['texturesubimage'] = PiglitGLTest(['arb_direct_state_access-texturesubimage'], run_concurrent=True)<br>
 spec['ARB_direct_state_access']['bind-texture-unit'] = PiglitGLTest(['arb_direct_state_access-bind-texture-unit'], run_concurrent=True)<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 e01894f..8ae8275 100644<br>
--- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt<br>
+++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt<br>
@@ -11,6 +11,7 @@ link_libraries (<br>
<br>
 piglit_add_executable (arb_direct_state_access-create-transformfeedbacks create-transformfeedbacks.c)<br>
 piglit_add_executable (arb_direct_state_access-transformfeedback-bufferbase transformfeedback-bufferbase.c)<br>
+piglit_add_executable (arb_direct_state_access-transformfeedback-bufferrange transformfeedback-bufferrange.c)<br>
 piglit_add_executable (arb_direct_state_access-dsa-textures dsa-textures.c dsa-utils.c)<br>
 piglit_add_executable (arb_direct_state_access-texturesubimage texturesubimage.c)<br>
 piglit_add_executable (arb_direct_state_access-bind-texture-unit bind-texture-unit.c)<br>
diff --git a/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c b/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c<br>
new file mode 100644<br>
</div></div>index 0000000..2e5fc6a<br>
--- /dev/null<br>
+++ b/tests/spec/arb_direct_state_access/transformfeedback-bufferrange.c<br>
@@ -0,0 +1,248 @@<br>
+/*<br>
<div><div class="h5">+ * Copyright © 2015 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<br>
+ * DEALINGS IN THE SOFTWARE.<br>
+ */<br>
+<br>
+/** @file transformfeedback-bufferrange.c<br>
+ * Simple transform feedback test drawing GL_POINTS and making use of the<br>
+ * transform-feedback-related direct state access entry points.<br>
+ *<br>
+ * Greatly inspired from ext_transform_feedback/points.c.<br>
+ *<br>
+ * From OpenGL 4.5, section 13.2.2 "Transform Feedback Primitive Capture",<br>
+ * page 422:<br>
+ *<br>
+ * "void TransformFeedbackBufferRange(uint xfb, uint index, uint buffer,<br>
+ *                                    intptr offset, sizeiptr size);<br>
+ *<br>
+ * xfb must be zero, indicating the default transform feedback object, or the<br>
+ * name of an existing transform feedback object. buffer must be zero or the<br>
+ * name of an existing buffer object.<br>
+ *<br>
+ * TransformFeedbackBufferRange and TransformFeedbackBufferBase behave<br>
+ * similarly to BindBufferRange and BindBufferBase, respectively, except<br>
+ * that the target of the operation is xfb, and they do not affect any binding<br>
+ * to the generic TRANSFORM_FEEDBACK_BUFFER target.<br>
+ *<br>
+ * Errors<br>
+ * An INVALID_OPERATION error is generated if xfb is not zero or the name<br>
+ *  of an existing transform feedback object.<br>
+ * An INVALID_VALUE error is generated if buffer is not zero or the name of<br>
+ *  an existing buffer object.<br>
+ * An INVALID_VALUE error is generated if index is greater than or equal<br>
+ *  to the number of binding points for transform feedback, as described in<br>
+ *  section 6.7.1.<br>
+ * An INVALID_VALUE error is generated by TransformFeedbackBufferRange<br>
+ *  if offset is negative.<br>
+ * An INVALID_VALUE error is generated by TransformFeedbackBufferRange<br>
+ *  if size is less than or equal to zero.<br>
+ * An INVALID_VALUE error is generated by TransformFeedbackBufferRange<br>
+ *  if offset or size do not satisfy the constraints described for those<br>
+ * parameters for transform feedback array bindings, as described in<br>
+ *  section 6.7.1."<br>
+ */<br>
+<br>
</div></div><span class="">+#include "piglit-util-gl.h"<br>
+#include "dsa-utils.h"<br>
+<br>
+PIGLIT_GL_TEST_CONFIG_BEGIN<br>
</span>+       config.supports_gl_core_version = 31;<br>
<span class="">+       config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;<br>
+PIGLIT_GL_TEST_CONFIG_END<br>
+<br>
+<br>
+static GLuint prog;<br>
</span>+static GLuint xfb_buf[3], input_buf, vao;<br>
<span class="">+static const int xfb_buf_size = 500;<br>
+static const int offset = 16;<br>
+<br>
+static const char *vstext = {<br>
</span>+       "#version 140\n"<br>
+       "in float valIn;"<br>
+       "out float valOut1;"<br>
+       "out float valOut2;"<br>
+       "void main() {"<br>
+       "   valOut1 = valIn + 1;"<br>
+       "   valOut2 = valIn * 2;"<br>
+       "}"<br>
+};<br>
+<br>
+#define NUM_INPUTS 4<br>
+static const GLfloat inputs[NUM_INPUTS] =   {-1.0, 0.0, 1.0, 3.0};<br>
+static const GLfloat out1_ret[NUM_INPUTS] = { 0.0, 1.0, 2.0, 4.0};<br>
+static const GLfloat out2_ret[NUM_INPUTS] = {-2.0, 0.0, 2.0, 6.0};<br>
<span class="">+<br>
+void<br>
+piglit_init(int argc, char **argv)<br>
+{<br>
</span>+       static const char *varyings[] = { "valOut1", "valOut2" };<br>
+       GLint inAttrib;<br>
<span class="">+<br>
+       /* Check the driver. */<br>
</span><span class="">+       piglit_require_extension("GL_ARB_transform_feedback3");<br>
+       piglit_require_extension("GL_ARB_direct_state_access");<br>
+<br>
+       /* Create shaders. */<br>
+       prog = piglit_build_simple_program_unlinked(vstext, NULL);<br>
+       glTransformFeedbackVaryings(prog, 2, varyings,<br>
+                                       GL_SEPARATE_ATTRIBS);<br>
+       glLinkProgram(prog);<br>
+       if (!piglit_link_check_status(prog)) {<br>
+               glDeleteProgram(prog);<br>
+               piglit_report_result(PIGLIT_FAIL);<br>
+       }<br>
+       glUseProgram(prog);<br>
+<br>
</span>+       /* Set up the Vertex Array Buffer */<br>
+       glEnable(GL_VERTEX_ARRAY);<br>
+       glGenVertexArrays(1, &vao);<br>
+       glBindVertexArray(vao);<br>
+<br>
+       /* Set up the input data buffer */<br>
+       glGenBuffers(1, &input_buf);<br>
+       glBindBuffer(GL_ARRAY_BUFFER, input_buf);<br>
+       glBufferData(GL_ARRAY_BUFFER, sizeof(inputs), inputs, GL_STATIC_DRAW);<br>
+       inAttrib = glGetAttribLocation(prog, "valIn");<br>
+       piglit_check_gl_error(GL_NO_ERROR);<br>
+       glVertexAttribPointer(inAttrib, 1, GL_FLOAT, GL_FALSE, 0, 0);<br>
+       glEnableVertexAttribArray(inAttrib);<br>
<span class="">+}<br>
+<br>
+static bool<br>
+equal(float a, float b)<br>
+{<br>
</span>+       float tolerance[4];<br>
+       piglit_compute_probe_tolerance(GL_RGBA, tolerance);<br>
+       return fabsf(a - b) < tolerance[0];<br>
<span class="">+}<br>
+<br>
+enum piglit_result<br>
+piglit_display(void)<br>
+{<br>
</span><span class="">+       GLint max_bind_points = 0;<br>
+       GLuint q, num_prims;<br>
+       bool pass = true, test = true;<br>
+       GLfloat *v, *w;<br>
</span>+       int i;<br>
+<br>
+       /* init the transform feedback buffers */<br>
+       glGenBuffers(3, xfb_buf);<br>
<span class="">+       glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[2]);<br>
+       piglit_check_gl_error(GL_NO_ERROR);<br>
+<br>
</span>+       /* Fetch the number of bind points */<br>
<div><div class="h5">+       glGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, &max_bind_points);<br>
+       SUBTEST(GL_NO_ERROR, pass, "fetch maximum number of bind points");<br>
+<br>
+       /* bind a non-existing transform feedback BO */<br>
+       glTransformFeedbackBufferRange(1337, 0, 0, 0, 4096);<br>
+       SUBTEST(GL_INVALID_OPERATION, pass, "bind non-existing transform "<br>
+                                           "feedback BO");<br>
+<br>
+       /* bind a non-existing output BO */<br>
+       glTransformFeedbackBufferRange(0, 0, 1337, 0, 4096);<br>
+       SUBTEST(GL_INVALID_VALUE, pass, "bind a non-existing output BO");<br>
+<br>
+       /* bind to a negative index */<br>
+       glTransformFeedbackBufferRange(0, -1, xfb_buf[2], 0, 4096);<br>
+       SUBTEST(GL_INVALID_VALUE, pass, "bind negative index");<br>
+<br>
+       /* bind to an index == max */<br>
+       glTransformFeedbackBufferRange(0, max_bind_points, xfb_buf[2], 0,<br>
+                       4096);<br>
+       SUBTEST(GL_INVALID_VALUE, pass, "bind to index == max_bind_points "<br>
+               "(%i)", max_bind_points);<br>
+<br>
+       /* bind at a non-aligned offset */<br>
+       glTransformFeedbackBufferRange(0, 0, xfb_buf[2], 3, 4096);<br>
+       SUBTEST(GL_INVALID_VALUE, pass, "bind at a non-aligned offset");<br>
+<br>
+       /* bind with a non-aligned size */<br>
+       glTransformFeedbackBufferRange(0, 0, xfb_buf[2], 0, 4095);<br>
+       SUBTEST(GL_INVALID_VALUE, pass, "bind with a non-aligned size");<br>
+<br>
</div></div>+       /* Set up the transform feedback buffer */<br>
<span class="">+       for (i = 0; i < 2; i++) {<br>
+               glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[i]);<br>
+               glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER,<br>
+                                xfb_buf_size, NULL, GL_STREAM_READ);<br>
+               glTransformFeedbackBufferRange(0, i, xfb_buf[i], offset,<br>
+                                              xfb_buf_size);<br>
+               piglit_check_gl_error(GL_NO_ERROR);<br>
+       }<br>
+<br>
</span>+       /* Set up the query that checks the # of primitives handled */<br>
<span class="">+       glGenQueries(1, &q);<br>
+       glBeginQuery(GL_PRIMITIVES_GENERATED, q);<br>
+       piglit_check_gl_error(GL_NO_ERROR);<br>
+<br>
</span>+       /* do the transform feedback */<br>
+       glBeginTransformFeedback(GL_POINTS);<br>
+       glBindBuffer(GL_ARRAY_BUFFER, input_buf);<br>
+       glDrawArrays(GL_POINTS, 0, NUM_INPUTS);<br>
<span class="">+       glEndTransformFeedback();<br>
+<br>
+       glEndQuery(GL_PRIMITIVES_GENERATED);<br>
+<br>
</span>+       /* check the number of primitives */<br>
<span class="">+       glGetQueryObjectuiv(q, GL_QUERY_RESULT, &num_prims);<br>
+       glDeleteQueries(1, &q);<br>
+       printf("%u primitives generated:\n", num_prims);<br>
</span>+       if (num_prims != NUM_INPUTS) {<br>
<span class="">+               printf("Incorrect number of prims generated.\n");<br>
</span>+               printf("Found %u, expected %u\n", num_prims, NUM_INPUTS);<br>
+               pass = false;<br>
<span class="">+               test = false;<br>
+       }<br>
+<br>
</span>+       /* check the result */<br>
<span class="">+       glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[0]);<br>
+       v = glMapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, GL_READ_ONLY) + offset;<br>
+       piglit_check_gl_error(GL_NO_ERROR);<br>
+       glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[1]);<br>
+       w = glMapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, GL_READ_ONLY) + offset;<br>
+       piglit_check_gl_error(GL_NO_ERROR);<br>
+<br>
+       for (i = 0; i < num_prims; i++) {<br>
</span>+               printf("%2d: (%2.0g, %2.0g) : ", i, v[i], w[i]);<br>
+               if (!equal(v[i], out1_ret[i]) || !equal(w[i], out2_ret[i])) {<br>
+                       printf("NOK, expected (%2.0g, %2.0g)\n",<br>
+                              out1_ret[i], out2_ret[i]);<br>
+                       test = false;<br>
+               } else<br>
+                       printf("OK\n");<br>
<span class="">+       }<br>
+       SUBTESTCONDITION(test, pass, "general test");<br>
+<br>
</span>+       piglit_present_results();<br>
+<br>
+       /* clean-up everything */<br>
<span class="">+       glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[0]);<br>
+       glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);<br>
+       glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfb_buf[1]);<br>
+       glUnmapBuffer(GL_TRANSFORM_FEEDBACK_BUFFER);<br>
</span>+       glDeleteBuffers(3, xfb_buf);<br>
+       glDeleteBuffers(1, &input_buf);<br>
+       glDeleteVertexArrays(1, &vao);<br>
+       glDeleteProgram(prog);<br>
<span class="">+<br>
+       return pass ? PIGLIT_PASS : PIGLIT_FAIL;<br>
+}<br>
--<br>
</span>2.3.1<br>
<div class="HOEnZb"><div class="h5"><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>
</div></div></blockquote></div><br></div>