Actually this test is wrong. I'm going to send a v2 shortly. My updated test also uncovers a bug in i965 where it makes invalid assumptions about pointer alignment.
On Tue, Sep 15, 2015 at 6:27 PM, Glenn Kennard <[email protected]> wrote: > On Tue, 15 Sep 2015 22:56:58 +0200, Ilia Mirkin <[email protected]> > wrote: > >> --- >> tests/all.py | 1 + >> .../arb_texture_buffer_object/CMakeLists.gl.txt | 1 + >> tests/spec/arb_texture_buffer_object/max-size.c | 99 >> ++++++++++++++++++++++ >> 3 files changed, 101 insertions(+) >> create mode 100644 tests/spec/arb_texture_buffer_object/max-size.c >> >> diff --git a/tests/all.py b/tests/all.py >> index 4fbe75b..761ec5c 100644 >> --- a/tests/all.py >> +++ b/tests/all.py >> @@ -2372,6 +2372,7 @@ with profile.group_manager( >> g(['arb_texture_buffer_object-get'], 'get') >> g(['arb_texture_buffer_object-fetch-outside-bounds'], >> 'fetch-outside-bounds') >> + g(['arb_texture_buffer_object-max-size'], 'max-size') >> g(['arb_texture_buffer_object-minmax'], 'minmax') >> g(['arb_texture_buffer_object-negative-bad-bo'], 'negative-bad-bo') >> g(['arb_texture_buffer_object-negative-bad-format'], >> 'negative-bad-format') >> diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt >> b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt >> index 5019e52..2971582 100644 >> --- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt >> +++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt >> @@ -14,6 +14,7 @@ piglit_add_executable >> (arb_texture_buffer_object-data-sync data-sync.c) >> piglit_add_executable (arb_texture_buffer_object-dlist dlist.c) >> piglit_add_executable (arb_texture_buffer_object-formats formats.c) >> piglit_add_executable (arb_texture_buffer_object-get get.c) >> +piglit_add_executable (arb_texture_buffer_object-max-size max-size.c) >> piglit_add_executable (arb_texture_buffer_object-minmax minmax.c) >> piglit_add_executable (arb_texture_buffer_object-negative-bad-bo >> negative-bad-bo.c) >> piglit_add_executable (arb_texture_buffer_object-negative-bad-format >> negative-bad-format.c) >> diff --git a/tests/spec/arb_texture_buffer_object/max-size.c >> b/tests/spec/arb_texture_buffer_object/max-size.c >> new file mode 100644 >> index 0000000..cbbbeaf >> --- /dev/null >> +++ b/tests/spec/arb_texture_buffer_object/max-size.c >> @@ -0,0 +1,99 @@ >> +/* Copyright © 2015 Ilia Mirkin >> + * >> + * 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 max-size.c >> + * >> + * Tests that we can sample a maximally-sized texture buffer. >> + */ >> + >> +#include "piglit-util-gl.h" >> + >> +enum piglit_result >> +piglit_display(void) >> +{ >> + static const float green[4] = {0, 1, 0, 0}; >> + bool pass; >> + >> + glViewport(0, 0, piglit_width, piglit_height); >> + glClearColor(0.2, 0.2, 0.2, 0.2); >> + glClear(GL_COLOR_BUFFER_BIT); >> + >> + piglit_draw_rect(-1, -1, 2, 2); >> + >> + 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) >> +{ >> + 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" >> + "uniform int offset;\n" >> + "void main()\n" >> + "{\n" >> + " gl_FragColor = texelFetch(s, offset);\n" >> + "}\n"; >> + >> + GLuint tex, tbo; >> + static const uint8_t data[4] = {0x0, 0xff, 0x0, 0x0}; >> + GLuint prog; >> + GLint max, offset; >> + >> + prog = piglit_build_simple_program(vs_source, fs_source); >> + glUseProgram(prog); >> + >> + glGenBuffers(1, &tbo); >> + glBindBuffer(GL_TEXTURE_BUFFER, tbo); >> + >> + glGenTextures(1, &tex); >> + glBindTexture(GL_TEXTURE_BUFFER, tex); >> + >> + glGetIntegerv(GL_MAX_TEXTURE_BUFFER_SIZE, &max); >> + max -= max % sizeof(data); >> + >> + glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA8, tbo); >> + glBufferData(GL_TEXTURE_BUFFER, max, NULL, GL_STATIC_READ); >> + glBufferSubData(GL_TEXTURE_BUFFER, >> + max - sizeof(data), sizeof(data), data); >> + >> + offset = max / sizeof(data) - 1; >> + glUniform1i(glGetUniformLocation(prog, "offset"), offset); >> + printf("MAX_TEXTURE_BUFFER_SIZE: %d, offset: %d\n", max, offset); >> +} >> + >> +PIGLIT_GL_TEST_CONFIG_BEGIN >> + config.supports_gl_core_version = 31; >> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | >> PIGLIT_GL_VISUAL_RGBA; >> +PIGLIT_GL_TEST_CONFIG_END > > > Looks like it uncovered a bug in r600 where the limit reported is a bit too > optimistic... > > Tested-by / Reviewed-by: Glenn Kennard <[email protected]> _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
