[Piglit] [PATCH] GS: Test that EndPrimitive() is optional for geometry output layout of "points"
Paul Berry
stereotype441 at gmail.com
Mon Oct 7 23:35:50 CEST 2013
On 17 September 2013 16:21, Nicholas Mack <nichmack at gmail.com> wrote:
> ---
> tests/all.tests | 1 +
> .../glsl-1.50/execution/geometry/CMakeLists.gl.txt | 1 +
> ...ometry-end-primitive-optional-with-points-out.c | 161
> +++++++++++++++++++++
> 3 files changed, 163 insertions(+)
> create mode 100644
> tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 7057134..708e94f 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -950,6 +950,7 @@ for draw in ['', 'indexed']:
> 'core {0} {1}').format(draw, prim))
> spec['glsl-1.50']['built-in constants'] =
> concurrent_test('built-in-constants
> tests/spec/glsl-1.50/minimum-maximums.txt')
> spec['glsl-1.50']['gs-emits-too-few-verts'] =
> concurrent_test('glsl-1.50-gs-emits-too-few-verts')
> +spec['glsl-1.50']['gs-end-primitive-optional-with-points-out'] =
> concurrent_test('glsl-1.50-geometry-end-primitive-optional-with-points-out')
> spec['glsl-1.50']['getshaderiv-may-return-GS'] =
> concurrent_test('glsl-1.50-getshaderiv-may-return-GS')
> spec['glsl-1.50']['query-gs-prim-types'] =
> concurrent_test('glsl-1.50-query-gs-prim-types')
>
> diff --git a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> index 3d2ed79..2557d4e 100644
> --- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> +++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
> @@ -11,6 +11,7 @@ ${OPENGL_glu_LIBRARY}
> )
>
> piglit_add_executable (glsl-1.50-geometry-end-primitive end-primitive.c)
> +piglit_add_executable
> (glsl-1.50-geometry-end-primitive-optional-with-points-out
> geometry-end-primitive-optional-with-points-out.c)
> piglit_add_executable (glsl-1.50-geometry-primitive-id-restart
> primitive-id-restart.c)
> piglit_add_executable (glsl-1.50-geometry-primitive-types
> primitive-types.c)
> piglit_add_executable (glsl-1.50-gs-emits-too-few-verts
> gs-emits-too-few-verts.c)
> diff --git
> a/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
> b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
> new file mode 100644
> index 0000000..d6c4b44
> --- /dev/null
> +++
> b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
> @@ -0,0 +1,161 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * Test that when the GS output layout is "points" EndPrimitive() is
> optional.
> + *
> + * From the GLSL 1.50 spec, section 8.10 (Geometry Shader Functions):
> + *
> + * "If the output layout is declared to be “points”, calling
> EndPrimitive()
> + * is optional."
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 32;
> + config.supports_gl_core_version = 32;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGB |
> PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const char *vstext =
> + "#version 150\n"
> + "in vec3 vertex;\n"
> + "out vec3 pos;\n"
> + "void main() {\n"
> + " gl_Position = vec4(vertex, 1.);\n"
> + " pos = vertex;\n"
> + "}\n";
> +
> +static const char *gstext =
> + "#version 150\n"
> + "layout(triangles) in;\n"
> + "layout(points, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < 3; i++) {\n"
> + " gl_Position = vec4(pos[i], 1.);\n"
> + " EmitVertex();\n"
> + " }\n"
> + "}\n";
> +
> +static const char *fstext =
> + "#version 150\n"
> + "out vec4 color;\n"
> + "void main() {\n"
> + " color = vec4(0., 1., 0., 1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -0.9, 0.9, 0.0,
> + 0.9, 0.9, 0.0,
> + 0.9,-0.9, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2
> +};
> +static GLsizei indSize = sizeof(indices);
> +
> +static GLuint prog;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vs = 0, gs = 0, fs = 0;
> + GLuint vertIndex;
> +
> + prog = glCreateProgram();
> + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
> + gs = piglit_compile_shader_text(GL_GEOMETRY_SHADER, gstext);
> + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fstext);
> + glAttachShader(prog, vs);
> + glAttachShader(prog, gs);
> + glAttachShader(prog, fs);
> +
> + glLinkProgram(prog);
> + if(!piglit_link_check_status(prog)){
> + glDeleteProgram(prog);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + glUseProgram(prog);
> +
> + glGenBuffers(1, &vertBuff);
> + glBindBuffer(GL_ARRAY_BUFFER, vertBuff);
> + glBufferData(GL_ARRAY_BUFFER, vertSize, vertices, GL_STATIC_DRAW);
> +
> + glGenBuffers(1, &indexBuf);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> + glBufferData(GL_ELEMENT_ARRAY_BUFFER, indSize,
> + indices, GL_STATIC_DRAW);
> +
> + glGenVertexArrays(1, &vao);
> + glBindVertexArray(vao);
> +
> + vertIndex = glGetAttribLocation(prog, "vertex");
> +
> + glBindBuffer(GL_ARRAY_BUFFER, vertBuff);
> + glEnableVertexAttribArray(vertIndex);
> + glVertexAttribPointer(vertIndex, 3, GL_FLOAT, GL_FALSE, 0, 0);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + float green[] = {0, 1, 0};
> +
> + glClearColor(0, 0, 0, 1.);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + glDrawElements(GL_TRIANGLES, ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> +
> + pass = piglit_probe_pixel_rgb(.05 * piglit_width,
> + .95 * piglit_height,
> + green) && pass;
> + pass = piglit_probe_pixel_rgb(.95 * piglit_width,
> + .95 * piglit_height,
> + green) && pass;
> + pass = piglit_probe_pixel_rgb(.95 * piglit_width,
> + .05 * piglit_height,
> + green) && pass;
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 1.8.3.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20131007/e3b32d1c/attachment.html>
More information about the Piglit
mailing list