[Piglit] [PATCH] GL-3.2 ARB_draw_elements_base_vertex: Add MultiDrawElementsBaseVertex test.
Matt Turner
mattst88 at gmail.com
Tue Jul 30 14:46:59 PDT 2013
Mostly the same nitpicky comments as the last patch.
On Tue, Jul 30, 2013 at 11:12 AM, Jacob Penner <jkpenner91 at gmail.com> wrote:
> MultiDrawElementsBaseVertex was added in GL-3.2, test that it functions
> properly.
> ---
> .../CMakeLists.gl.txt | 2 +-
> .../multi-draw-elements-base-vertex.c | 181 +++++++++++++++++++++
> 2 files changed, 182 insertions(+), 1 deletion(-)
> create mode 100644 tests/spec/arb_draw_elements_base_vertex/multi-draw-elements-base-vertex.c
>
> diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
> index adbba29..1511393 100644
> --- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
> +++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
> @@ -11,5 +11,5 @@ link_libraries (
>
> piglit_add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c)
> piglit_add_executable (arb_draw_elements_base_vertex-dlist-arb_draw_instanced dlist-arb_draw_instanced.c)
> -
> +piglit_add_executable (multi-draw-elements-base-vertex multi-draw-elements-base-vertex.c)
> # vim: ft=cmake:
> diff --git a/tests/spec/arb_draw_elements_base_vertex/multi-draw-elements-base-vertex.c b/tests/spec/arb_draw_elements_base_vertex/multi-draw-elements-base-vertex.c
> new file mode 100644
> index 0000000..df267f2
> --- /dev/null
> +++ b/tests/spec/arb_draw_elements_base_vertex/multi-draw-elements-base-vertex.c
> @@ -0,0 +1,181 @@
> +/*
> + * 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 multi-draw-elements-base-vertex.c
> + *
> + * Section 2.8.2(Vertex Arrays) From GL spec 3.2 core:
> + * glMultiDrawElementsBaseVertex was added.
> + *
> + *
> + * (0)-------(1) Set up indices for quad 1 and 3.
> + * | 1 |
> + * (2)-------(3) Use a basevertex of 2 to shift
> + * | 2 | indices from quad 1 to 2 and
> + * (4)-------(5) from quad 3 to 4
> + * | 3 |
> + * (6)-------(7) End result 1 and 3 should be the
> + * | 4 | clear color while 2 and 4 are white.
> + * (8)-------(9)
> + *
> + *
> + * MultiDrawElementsBaseVertex behaves identically to
> + * DrawElementsBaseVertex, except that primcount separate
> + * lists of elements are specified instead. It has the
> + * same effect as:
> + *
> + * for (int i = 0; i < primcount ; i++)
> + * if (count[i] > 0)
> + * DrawElementsBaseVertex(mode, count[i], type,
> + * indices[i], basevertex[i]);
> + *
> + */
> +
> +#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_width = 48;
> + config.window_height = 48;
150x150, I think, is the minimum.
> + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +const char *vs_source = {
> + "#version 130\n"
> + "in vec2 vertex;\n"
> + "void main() {\n"
> + " gl_Position = vec4(vertex.xy, 0, 1);\n"
> + "}\n"
> +};
> +
> +const char *fs_source = {
> + "#version 130\n"
> + "void main() {\n"
> + " gl_FragColor = vec4(1,1,1,1);\n"
Spaces after commas.
> + "}\n"
> +};
> +
> +static GLuint vao;
> +static GLuint vertexBuffer;
> +static GLuint indexBuffer;
> +
> +// sets of two (x,y)
> +static GLfloat vertices[] = {
> + -1.0, 1.0,
> + 1.0, 1.0,
> + -1.0, 0.5,
> + 1.0, 0.5,
> + -1.0, 0.0,
> + 1.0, 0.0,
> + -1.0,-0.5,
> + 1.0,-0.5,
> + -1.0,-1.0,
> + 1.0,-1.0
> +};
> +static GLsizei vertices_size = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 1, 2, 3, // top square
> + 4, 5, 6, 5, 6, 7, // bot square
> +};
> +static GLsizei indices_size = sizeof(indices);
> +
> +static int indices_offset[] = {
> + 0, 6 * sizeof(GLuint)
> +};
> +static GLsizei indices_count[] = {
> + 6, 6
> +};
> +
> +static GLint basevertex[] = { 2, 2 };
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint program;
> + GLuint vertex_index;
> +
> + if (piglit_get_gl_version() < 32) {
> + piglit_require_extension("GL_ARB_draw_elements_base_vertex");
> + }
> +
> + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
> +
> + // Create program
> + program = piglit_build_simple_program(vs_source, fs_source);
> + glUseProgram(program);
> +
> +
> + // Gen vertex array buffer
> + glGenBuffers(1, &vertexBuffer);
> + glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
> + glBufferData(GL_ARRAY_BUFFER, vertices_size, vertices, GL_STATIC_DRAW);
> +
> + // Gen indices array buffer
> + glGenBuffers(1, &indexBuffer);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
> + glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices_size,
> + indices, GL_STATIC_DRAW);
Indention.
> +
> + // Gen VAO
> + glGenVertexArrays(1, &vao);
> + glBindVertexArray(vao);
> +
> + // Retrieve index from vs
> + vertex_index = glGetAttribLocation(program, "vertex");
> +
> + // Enable vertex attrib array
> + glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
> + glEnableVertexAttribArray(vertex_index);
> + glVertexAttribPointer(vertex_index, 2, GL_FLOAT, GL_FALSE, 0, 0);
> +}
Put a newline after the }
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + float white[] = {1,1,1};
> + float clear[] = {0,0,0};
Maybe use different colors.
> +
> + glClearColor(clear[0], clear[1], clear[2], 1.0);
> + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
No need for GL_DEPTH_BUFFER_BIT.
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
> +
> + glMultiDrawElementsBaseVertex(GL_TRIANGLES, indices_count,
> + GL_UNSIGNED_INT, (GLvoid*)indices_offset,
> + 2, basevertex);
Indention.
> +
> + // Check for test pass
> + pass = piglit_probe_pixel_rgb(24, 42, clear) && pass;
> + pass = piglit_probe_pixel_rgb(24, 30, white) && pass;
> + pass = piglit_probe_pixel_rgb(24, 18, clear) && pass;
> + pass = piglit_probe_pixel_rgb(24, 6, white) && pass;
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 1.8.3.1
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Both tests are really good.
More information about the Piglit
mailing list