On 10/08/2013 02:09 PM, Eric Anholt wrote: > We already have one for VBOs under general/
Reviewed-by: Ian Romanick <[email protected]> > --- > tests/all.tests | 1 + > .../arb_vertex_buffer_object/CMakeLists.gl.txt | 1 + > .../arb_vertex_buffer_object/ib-subdata-sync.c | 84 > ++++++++++++++++++++++ > 3 files changed, 86 insertions(+) > create mode 100644 tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c > > diff --git a/tests/all.tests b/tests/all.tests > index dfb3b79..8b276c2 100644 > --- a/tests/all.tests > +++ b/tests/all.tests > @@ -1586,6 +1586,7 @@ arb_vertex_buffer_object['mixed-immediate-and-vbo'] = > PlainExecTest(['arb_vertex > add_plain_test(arb_vertex_buffer_object, 'fdo14575') > add_plain_test(arb_vertex_buffer_object, 'fdo22540') > add_plain_test(arb_vertex_buffer_object, 'fdo31934') > +arb_vertex_buffer_object['ib-subdata-sync'] = > concurrent_test('arb_vertex_buffer_object-ib-subdata-sync') > add_plain_test(arb_vertex_buffer_object, 'pos-array') > add_plain_test(arb_vertex_buffer_object, 'vbo-bufferdata') > add_plain_test(arb_vertex_buffer_object, 'vbo-map-remap') > diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt > b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt > index dacce87..9346dfb 100644 > --- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt > +++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt > @@ -11,5 +11,6 @@ link_libraries ( > > piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset > elements-negative-offset.c) > piglit_add_executable (arb_vertex_buffer_object-mixed-immediate-and-vbo > mixed-immediate-and-vbo.c) > +piglit_add_executable (arb_vertex_buffer_object-ib-subdata-sync > ib-subdata-sync.c) > > # vim: ft=cmake: > diff --git a/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c > b/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c > new file mode 100644 > index 0000000..019d745 > --- /dev/null > +++ b/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c > @@ -0,0 +1,84 @@ > +/* > + * Copyright © 2013 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-common.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_compat_version = 10; > + > + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +enum piglit_result > +piglit_display(void) > +{ > + float verts[] = { > + -1, -1, > + 0, -1, > + 0, 1, > + -1, 1, > + > + 0, -1, > + 1, -1, > + 1, 1, > + 0, 1, > + }; > + uint32_t ib_1[] = {0, 1, 2, 3}; > + uint32_t ib_2[] = {4, 5, 6, 7}; > + > + bool pass = true; > + size_t size = sizeof(ib_1); > + GLuint vbo, ibo; > + float green[] = {0, 1, 0, 0}; > + > + glColor4fv(green); > + > + glGenBuffersARB(1, &vbo); > + glBindBufferARB(GL_ARRAY_BUFFER, vbo); > + glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts, GL_STREAM_DRAW); > + glEnableClientState(GL_VERTEX_ARRAY); > + glVertexPointer(2, GL_FLOAT, 0, NULL); > + > + glGenBuffersARB(1, &ibo); > + glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, ibo); > + glBufferData(GL_ELEMENT_ARRAY_BUFFER, 4096, NULL, GL_STREAM_DRAW); > + > + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, size, ib_1); > + glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_INT, NULL); > + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, size, ib_2); > + glDrawElements(GL_TRIANGLE_FAN, 4, GL_UNSIGNED_INT, NULL); > + > + pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); > + > + piglit_present_results(); > + > + return pass ? PIGLIT_PASS : PIGLIT_FAIL; > +} > + > +void > +piglit_init(int argc, char *argv[]) > +{ > + piglit_require_extension("GL_ARB_vertex_buffer_object"); > +} > _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
