On 10/08/2013 02:09 PM, Eric Anholt wrote: With something done about the versioning comment below,
Reviewed-by: Ian Romanick <[email protected]> > --- > tests/all.tests | 1 + > .../arb_texture_buffer_object/CMakeLists.gl.txt | 1 + > .../spec/arb_texture_buffer_object/subdata-sync.c | 102 > +++++++++++++++++++++ > 3 files changed, 104 insertions(+) > create mode 100644 tests/spec/arb_texture_buffer_object/subdata-sync.c > > diff --git a/tests/all.tests b/tests/all.tests > index 14787a6..f08878e 100644 > --- a/tests/all.tests > +++ b/tests/all.tests > @@ -1418,6 +1418,7 @@ arb_texture_buffer_object['negative-bad-bo'] = > concurrent_test('arb_texture_buff > arb_texture_buffer_object['negative-bad-format'] = > concurrent_test('arb_texture_buffer_object-negative-bad-format') > arb_texture_buffer_object['negative-bad-target'] = > concurrent_test('arb_texture_buffer_object-negative-bad-target') > arb_texture_buffer_object['negative-unsupported'] = > concurrent_test('arb_texture_buffer_object-negative-unsupported') > +arb_texture_buffer_object['subdata-sync'] = > concurrent_test('arb_texture_buffer_object-subdata-sync') > arb_texture_buffer_object['unused-name'] = > concurrent_test('arb_texture_buffer_object-unused-name') > > arb_texture_buffer_range = Group() > diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt > b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt > index e1f3a2e..e4c616d 100644 > --- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt > +++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt > @@ -19,5 +19,6 @@ piglit_add_executable > (arb_texture_buffer_object-negative-bad-format negative-ba > piglit_add_executable (arb_texture_buffer_object-negative-bad-target > negative-bad-target.c) > piglit_add_executable (arb_texture_buffer_object-negative-unsupported > negative-unsupported.c) > piglit_add_executable (arb_texture_buffer_object-render-no-bo render-no-bo.c) > +piglit_add_executable (arb_texture_buffer_object-subdata-sync subdata-sync.c) > piglit_add_executable (arb_texture_buffer_object-unused-name unused-name.c) > piglit_add_executable (arb_texture_buffer_object-fetch-outside-bounds > fetch-outside-bounds.c) > diff --git a/tests/spec/arb_texture_buffer_object/subdata-sync.c > b/tests/spec/arb_texture_buffer_object/subdata-sync.c > new file mode 100644 > index 0000000..ff81bb7 > --- /dev/null > +++ b/tests/spec/arb_texture_buffer_object/subdata-sync.c > @@ -0,0 +1,102 @@ > +/* > + * 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. > + */ > + > +/** @file subdata-sync.c > + * > + * Tests that glBufferSubData() synchronizes correctly with TBO rendering. > + */ > + > +#include "piglit-util-gl-common.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 10; > + config.supports_gl_core_version = 31; > + > + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; > +PIGLIT_GL_TEST_CONFIG_END > + > +enum piglit_result > +piglit_display(void) > +{ > + static const char *vs_source = > + "#version 140\n" > + "in vec4 piglit_vertex;\n" > + "void main()\n" > + "{\n" > + " gl_Position = piglit_vertex;\n" > + "}\n"; > + > + static const char *fs_source = > + "#version 140\n" > + "uniform samplerBuffer s;\n" > + "void main()\n" > + "{\n" > + " gl_FragColor = texelFetch(s, 0);\n" > + "}\n"; > + > + bool pass = true; > + GLuint tex, bo; > + GLuint prog; > + float green[] = {0, 1, 0, 0}; > + float blue[] = {0, 0, 1, 0}; > + uint8_t g_rgba8[] = {0x00, 0xff, 0x00, 0x00}; > + uint8_t b_rgba8[] = {0x00, 0x00, 0xff, 0x00}; > + > + prog = piglit_build_simple_program(vs_source, fs_source); > + glUseProgram(prog); > + > + glGenBuffers(1, &bo); > + glBindBuffer(GL_TEXTURE_BUFFER, bo); Weird indentation here. > + /* Make the buffer bigger than the data to trigger the driver > + * code path we want. > + */ > + glBufferData(GL_TEXTURE_BUFFER, 4096, NULL, GL_STREAM_DRAW); > + glBufferSubData(GL_TEXTURE_BUFFER, 0, sizeof(g_rgba8), g_rgba8); > + > + glGenTextures(1, &tex); > + glBindTexture(GL_TEXTURE_BUFFER, tex); > + glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA8, bo); > + > + piglit_draw_rect(-1, -1, 1, 2); > + glBufferSubData(GL_TEXTURE_BUFFER, 0, sizeof(b_rgba8), b_rgba8); > + piglit_draw_rect(0, -1, 1, 2); > + > + pass = pass && piglit_probe_rect_rgba(0, 0, > + piglit_width / 2, piglit_height, > + green); > + pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, > + piglit_width / 2, piglit_height, > + blue); > + > + piglit_present_results(); > + > + return pass ? PIGLIT_PASS : PIGLIT_FAIL; > +} > + > +void > +piglit_init(int argc, char **argv) > +{ > + piglit_require_GLSL_version(140); > + if (piglit_get_gl_version() < 31) I don't think anyone will exposed GLSL 1.40 without GL 3.1. For this to be useful, the test should use a 1.20 shader with GL_ARB_texture_buffer_object enabled in the pre-3.1 case. Or just require 3.1. > + piglit_require_extension("GL_ARB_texture_buffer_object"); > +} > _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
