Assuming this passes on closed-source drivers that support the feature,
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 06/23/2018 12:06 AM, Timothy Arceri wrote:
> From the ARB_draw_indirect spec:
>
> "Initially zero is bound to DRAW_INDIRECT_BUFFER. In the
> compatibility profile, this indicates that DrawArraysIndirect and
> DrawElementsIndirect are to source their arguments directly from the
> pointer passed as their <indirect> parameters."
> ---
> tests/opengl.py | 2 +
> .../spec/arb_draw_indirect/CMakeLists.gl.txt | 2 +
> .../arb_draw_indirect/draw-arrays-compat.c | 120 ++++++++++++++++
> .../arb_draw_indirect/draw-elements-compat.c | 130 ++++++++++++++++++
> 4 files changed, 254 insertions(+)
> create mode 100644 tests/spec/arb_draw_indirect/draw-arrays-compat.c
> create mode 100644 tests/spec/arb_draw_indirect/draw-elements-compat.c
>
> diff --git a/tests/opengl.py b/tests/opengl.py
> index 669d9055b..2460b0a88 100644
> --- a/tests/opengl.py
> +++ b/tests/opengl.py
> @@ -1728,8 +1728,10 @@ with profile.test_list.group_manager(
> grouptools.join('spec', 'ARB_draw_indirect')) as g:
> g(['arb_draw_indirect-api-errors'])
> g(['arb_draw_indirect-draw-arrays'])
> + g(['arb_draw_indirect-draw-arrays-compat'])
> g(['arb_draw_indirect-draw-arrays-prim-restart'])
> g(['arb_draw_indirect-draw-elements'])
> + g(['arb_draw_indirect-draw-elements-compat'])
> g(['arb_draw_indirect-draw-arrays-base-instance'])
> g(['arb_draw_indirect-draw-elements-base-instance'])
> g(['arb_draw_indirect-draw-elements-prim-restart'])
> diff --git a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
> b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
> index 977911140..6e038d403 100644
> --- a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
> +++ b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
> @@ -10,8 +10,10 @@ link_libraries (
>
> piglit_add_executable (arb_draw_indirect-api-errors api-errors.c)
> piglit_add_executable (arb_draw_indirect-draw-arrays draw-arrays.c)
> +piglit_add_executable (arb_draw_indirect-draw-arrays-compat
> draw-arrays-compat.c)
> piglit_add_executable (arb_draw_indirect-draw-arrays-prim-restart
> draw-arrays-prim-restart.c)
> piglit_add_executable (arb_draw_indirect-draw-elements draw-elements.c)
> +piglit_add_executable (arb_draw_indirect-draw-elements-compat
> draw-elements-compat.c)
> piglit_add_executable (arb_draw_indirect-draw-arrays-base-instance
> draw-arrays-base-instance.c)
> piglit_add_executable (arb_draw_indirect-draw-elements-base-instance
> draw-elements-base-instance.c)
> piglit_add_executable (arb_draw_indirect-draw-elements-prim-restart
> draw-elements-prim-restart.c)
> diff --git a/tests/spec/arb_draw_indirect/draw-arrays-compat.c
> b/tests/spec/arb_draw_indirect/draw-arrays-compat.c
> new file mode 100644
> index 000000000..fd906fe2f
> --- /dev/null
> +++ b/tests/spec/arb_draw_indirect/draw-arrays-compat.c
> @@ -0,0 +1,120 @@
> +/*
> + * 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.
> + *
> + */
> +
> +/* Basic test of glDrawArraysIndirect for compat profile. Test that indirect
> + * data can be passed directly when GL_DRAW_INDIRECT_BUFFER is 0 (the default
> + * value).
> + *
> + * This test is adapted from draw-arrays.c
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 31;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +GLuint vao;
> +GLint prog;
> +
> +float red[] = {1,0,0};
> +float blue[] = {0,0,1};
> +
> +float vertices_data[] = {
> + -1, -1,
> + 1, -1,
> + -1, 1,
> +};
> +
> +GLuint indirect_data[] = {
> + 3, /* count */
> + 1, /* primcount */
> + 0, /* first vertex */
> + 0, /* mbz */
> +};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> +
> + glViewport(0, 0, 128, 128);
> +
> + glClearColor(0,0,1,1);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glUseProgram(prog);
> +
> + glDrawArraysIndirect(GL_TRIANGLES, indirect_data);
> +
> + glUseProgram(0);
> +
> + piglit_present_results();
> +
> + pass = piglit_probe_pixel_rgb(32, 32, red) && pass;
> + pass = piglit_probe_pixel_rgb(96, 96, blue) && pass;
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vertices_bo;
> +
> + piglit_require_extension("GL_ARB_draw_indirect");
> +
> + glGenVertexArrays(1, &vao);
> + glBindVertexArray(vao);
> +
> + glGenBuffers(1, &vertices_bo);
> + glBindBuffer(GL_ARRAY_BUFFER, vertices_bo);
> + glBufferData(GL_ARRAY_BUFFER, sizeof(vertices_data), vertices_data,
> GL_STATIC_DRAW);
> + glEnableVertexAttribArray(0);
> + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
> +
> + prog = piglit_build_simple_program(
> + "#version 130\n"
> + "#extension GL_ARB_explicit_attrib_location: require\n"
> + "\n"
> + "layout(location=0) in vec2 pos;\n"
> + "\n"
> + "void main() {\n"
> + " gl_Position = vec4(pos, 0, 1);\n"
> + "}\n",
> +
> + "#version 130\n"
> + "\n"
> + "void main() {\n"
> + " gl_FragColor = vec4(1,0,0,1);\n"
> + "}\n");
> +
> + glBindVertexArray(0);
> +}
> diff --git a/tests/spec/arb_draw_indirect/draw-elements-compat.c
> b/tests/spec/arb_draw_indirect/draw-elements-compat.c
> new file mode 100644
> index 000000000..7a4724295
> --- /dev/null
> +++ b/tests/spec/arb_draw_indirect/draw-elements-compat.c
> @@ -0,0 +1,130 @@
> +/*
> + * 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.
> + *
> + */
> +
> +/* Basic test of glDrawElementsIndirect for compat profile. Test that
> indirect
> + * data can be passed directly when GL_DRAW_INDIRECT_BUFFER is 0 (the default
> + * value).
> + *
> + * This test is adapted from draw-elements.c
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 31;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +GLuint vao;
> +GLint prog;
> +
> +float red[] = {1,0,0};
> +float blue[] = {0,0,1};
> +
> +float vertices_data[] = {
> + -1, -1,
> + 1, -1,
> + -1, 1,
> +};
> +
> +unsigned short indices_data[] = {
> + 0, 1, 2,
> +};
> +
> +GLuint indirect_data[] = {
> + 3, /* count */
> + 1, /* primcount */
> + 0, /* first index */
> + 0, /* base vertex */
> + 0, /* mbz */
> +};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> +
> + glViewport(0, 0, 128, 128);
> +
> + glClearColor(0,0,1,1);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glUseProgram(prog);
> +
> + glDrawElementsIndirect(GL_TRIANGLES, GL_UNSIGNED_SHORT, indirect_data);
> +
> + glUseProgram(0);
> +
> + piglit_present_results();
> +
> + pass = piglit_probe_pixel_rgb(32, 32, red) && pass;
> + pass = piglit_probe_pixel_rgb(96, 96, blue) && pass;
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vertices_bo;
> + GLuint indices_bo;
> +
> + piglit_require_extension("GL_ARB_draw_indirect");
> +
> + glGenVertexArrays(1, &vao);
> + glBindVertexArray(vao);
> +
> + glGenBuffers(1, &vertices_bo);
> + glBindBuffer(GL_ARRAY_BUFFER, vertices_bo);
> + glBufferData(GL_ARRAY_BUFFER, sizeof(vertices_data), vertices_data,
> GL_STATIC_DRAW);
> + glEnableVertexAttribArray(0);
> + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, 0);
> +
> + glGenBuffers(1, &indices_bo);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_bo);
> + glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices_data),
> indices_data, GL_STATIC_DRAW);
> +
> + prog = piglit_build_simple_program(
> + "#version 130\n"
> + "#extension GL_ARB_explicit_attrib_location: require\n"
> + "\n"
> + "layout(location=0) in vec2 pos;\n"
> + "\n"
> + "void main() {\n"
> + " gl_Position = vec4(pos, 0, 1);\n"
> + "}\n",
> +
> + "#version 130\n"
> + "\n"
> + "void main() {\n"
> + " gl_FragColor = vec4(1,0,0,1);\n"
> + "}\n");
> +
> + glBindVertexArray(0);
> +}
>
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
