[Piglit] [PATCH] Test that geometry shaders input types must match the primitive mode
Paul Berry
stereotype441 at gmail.com
Fri Aug 30 09:33:53 PDT 2013
On 28 August 2013 14:38, Nicholas Mack <nichmack at gmail.com> wrote:
> ---
> tests/spec/glsl-1.50/CMakeLists.gl.txt | 22 +++
> tests/spec/glsl-1.50/CMakeLists.txt | 1 +
> .../glsl-1.50/gs-mismatch-prim-type-lines-adj.c | 167
> +++++++++++++++++++++
> tests/spec/glsl-1.50/gs-mismatch-prim-type-lines.c | 167
> +++++++++++++++++++++
> .../spec/glsl-1.50/gs-mismatch-prim-type-points.c | 167
> +++++++++++++++++++++
> .../gs-mismatch-prim-type-triangles-adj.c | 166
> ++++++++++++++++++++
> .../glsl-1.50/gs-mismatch-prim-type-triangles.c | 166
> ++++++++++++++++++++
> 7 files changed, 856 insertions(+)
> create mode 100644 tests/spec/glsl-1.50/CMakeLists.gl.txt
> create mode 100644 tests/spec/glsl-1.50/gs-mismatch-prim-type-lines-adj.c
> create mode 100644 tests/spec/glsl-1.50/gs-mismatch-prim-type-lines.c
> create mode 100644 tests/spec/glsl-1.50/gs-mismatch-prim-type-points.c
> create mode 100644
> tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles-adj.c
> create mode 100644 tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles.c
>
Taken individually, the tests look reasonable. But I'm concerned about the
amount of code duplication between them. There are 5 new .c files, and all
of them are exactly the same except for a minor comment change, the
geometry shader input layout, and the valids[] and invalids[] arrays. Can
we change these to a single .c file that uses a command-line argument to
choose which input layout to test? For an example of how to do this, have
a look at tests/spec/glsl-1.50/execution/geometry/primitive-types.c.
Also, two minor nit picks:
- New C tests need to be added to all.tests, or they won't get run.
- These tests should go in tests/spec/glsl-1.50/execution/geometry.
>
> diff --git a/tests/spec/glsl-1.50/CMakeLists.gl.txt
> b/tests/spec/glsl-1.50/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..5ddd05a
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/CMakeLists.gl.txt
> @@ -0,0 +1,22 @@
> +include_directories(
> +${GLEXT_INCLUDE_DIR}
> +${OPENGL_INCLUDE_PATH}
> +${piglit_SOURCE_DIR}/tests/util
> +)
> +
> +link_libraries (
> +piglitutil_${piglit_target_api}
> +${OPENGL_gl_LIBRARY}
> +${OPENGL_glu_LIBRARY}
> +)
> +
> +piglit_add_executable (glsl-1.50-gs-mismatch-prim-type-lines
> + gs-mismatch-prim-type-lines.c)
> +piglit_add_executable (glsl-1.50-gs-mismatch-prim-type-lines-adj
> + gs-mismatch-prim-type-lines-adj.c)
> +piglit_add_executable (glsl-1.50-gs-mismatch-prim-type-points
> + gs-mismatch-prim-type-points.c)
> +piglit_add_executable (glsl-1.50-gs-mismatch-prim-type-triangles
> + gs-mismatch-prim-type-triangles.c)
> +piglit_add_executable (glsl-1.50-gs-mismatch-prim-type-triangles-adj
> + gs-mismatch-prim-type-triangles-adj.c)
> diff --git a/tests/spec/glsl-1.50/CMakeLists.txt
> b/tests/spec/glsl-1.50/CMakeLists.txt
> index bb76f08..e4126fc 100644
> --- a/tests/spec/glsl-1.50/CMakeLists.txt
> +++ b/tests/spec/glsl-1.50/CMakeLists.txt
> @@ -1 +1,2 @@
> add_subdirectory (execution)
> +piglit_include_target_api()
> diff --git a/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines-adj.c
> b/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines-adj.c
> new file mode 100644
> index 0000000..1ede844
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines-adj.c
> @@ -0,0 +1,167 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * From the GLSL 3.2 spec, section 2.12.1 (Geometry Shader Input
> Primitives):
> + *
> + * "If a geometry shader is active, any command that transfers vertices
> to the
> + * GL will generate an INVALID_OPERATION error if the primitive mode
> parameter
> + * is incompatible with the input primitive type of the currently active
> + * program object, as discussed below."
> + *
> + * "Geometry shaders that operate on line segments with adjacent vertices
> are
> + * valid only for the LINES_ADJACENCY and LINE_STRIP_ADJACENCY primitive
> + * types."
> + */
> +
> +#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(lines_adjacency) in;\n"
> + "layout(triangles, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); 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(1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -1.0, 1.0, 0.0,
> + 1.0, 1.0, 0.0,
> + 1.0,-1.0, 0.0,
> + -1.0,-1.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 0, 2, 3
> +};
> +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);
> +}
> +
> +static GLenum valids[] = {GL_LINES_ADJACENCY, GL_LINE_STRIP_ADJACENCY};
> +static GLenum invalids[] = {GL_POINTS, GL_LINES, GL_LINE_STRIP,
> GL_LINE_LOOP,
> + GL_TRIANGLES, GL_TRIANGLE_STRIP,
> + GL_TRIANGLE_FAN, GL_TRIANGLES_ADJACENCY,
> + GL_TRIANGLE_STRIP_ADJACENCY};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + glDrawElements(valids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + }
> +
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + glDrawElements(invalids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> diff --git a/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines.c
> b/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines.c
> new file mode 100644
> index 0000000..9e57648
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/gs-mismatch-prim-type-lines.c
> @@ -0,0 +1,167 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * From the GLSL 3.2 spec, section 2.12.1 (Geometry Shader Input
> Primitives):
> + *
> + * "If a geometry shader is active, any command that transfers vertices
> to the
> + * GL will generate an INVALID_OPERATION error if the primitive mode
> parameter
> + * is incompatible with the input primitive type of the currently active
> + * program object, as discussed below."
> + *
> + * "Geometry shaders that operate on line segments are valid only for the
> LINES,
> + * LINE_STRIP, and LINE_LOOP primitive types."
> + */
> +
> +#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(lines) in;\n"
> + "layout(triangles, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); 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(1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -1.0, 1.0, 0.0,
> + 1.0, 1.0, 0.0,
> + 1.0,-1.0, 0.0,
> + -1.0,-1.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 0, 2, 3
> +};
> +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);
> +}
> +
> +static GLenum valids[] = {GL_LINES, GL_LINE_STRIP, GL_LINE_LOOP};
> +static GLenum invalids[] = {GL_POINTS, GL_LINES_ADJACENCY,
> + GL_LINE_STRIP_ADJACENCY,
> + GL_TRIANGLES, GL_TRIANGLE_STRIP,
> + GL_TRIANGLE_FAN, GL_TRIANGLES_ADJACENCY,
> + GL_TRIANGLE_STRIP_ADJACENCY};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + glDrawElements(valids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + }
> +
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + glDrawElements(invalids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> diff --git a/tests/spec/glsl-1.50/gs-mismatch-prim-type-points.c
> b/tests/spec/glsl-1.50/gs-mismatch-prim-type-points.c
> new file mode 100644
> index 0000000..81dbaa7
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/gs-mismatch-prim-type-points.c
> @@ -0,0 +1,167 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * From the GLSL 3.2 spec, section 2.12.1 (Geometry Shader Input
> Primitives):
> + *
> + * "If a geometry shader is active, any command that transfers vertices
> to the
> + * GL will generate an INVALID_OPERATION error if the primitive mode
> parameter
> + * is incompatible with the input primitive type of the currently active
> + * program object, as discussed below."
> + *
> + * "Geometry shaders that operate on points are valid only for the POINTS
> + * primitive type."
> + */
> +
> +#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(points) in;\n"
> + "layout(triangles, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); 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(1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -1.0, 1.0, 0.0,
> + 1.0, 1.0, 0.0,
> + 1.0,-1.0, 0.0,
> + -1.0,-1.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 0, 2, 3
> +};
> +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);
> +}
> +
> +static GLenum valids[] = {GL_POINTS};
> +static GLenum invalids[] = {GL_LINES, GL_LINE_STRIP, GL_LINE_LOOP,
> + GL_LINES_ADJACENCY,
> GL_LINE_STRIP_ADJACENCY,
> + GL_TRIANGLES, GL_TRIANGLE_STRIP,
> + GL_TRIANGLE_FAN, GL_TRIANGLES_ADJACENCY,
> + GL_TRIANGLE_STRIP_ADJACENCY};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + glDrawElements(valids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + }
> +
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + glDrawElements(invalids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> diff --git a/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles-adj.c
> b/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles-adj.c
> new file mode 100644
> index 0000000..1dbe84f
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles-adj.c
> @@ -0,0 +1,166 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * From the GLSL 3.2 spec, section 2.12.1 (Geometry Shader Input
> Primitives):
> + *
> + * "If a geometry shader is active, any command that transfers vertices
> to the
> + * GL will generate an INVALID_OPERATION error if the primitive mode
> parameter
> + * is incompatible with the input primitive type of the currently active
> + * program object, as discussed below."
> + *
> + * "Geometry shaders that operate on triangles with adjacent vertices are
> valid
> + * for the TRIANGLES_ADJACENCY and TRIANGLE_STRIP_ADJACENCY primitive
> types."
> + */
> +
> +#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_adjacency) in;\n"
> + "layout(triangles, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); 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(1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -1.0, 1.0, 0.0,
> + 1.0, 1.0, 0.0,
> + 1.0,-1.0, 0.0,
> + -1.0,-1.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 0, 2, 3
> +};
> +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);
> +}
> +
> +static GLenum valids[] = {GL_TRIANGLES_ADJACENCY,
> GL_TRIANGLE_STRIP_ADJACENCY};
> +static GLenum invalids[] = {GL_POINTS, GL_LINES, GL_LINE_STRIP,
> GL_LINE_LOOP,
> + GL_TRIANGLES, GL_TRIANGLE_STRIP,
> + GL_LINES_ADJACENCY,
> GL_LINE_STRIP_ADJACENCY,
> + GL_TRIANGLE_FAN};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + glDrawElements(valids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + }
> +
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + glDrawElements(invalids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> diff --git a/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles.c
> b/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles.c
> new file mode 100644
> index 0000000..8872431
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/gs-mismatch-prim-type-triangles.c
> @@ -0,0 +1,166 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * From the GLSL 3.2 spec, section 2.12.1 (Geometry Shader Input
> Primitives):
> + *
> + * "If a geometry shader is active, any command that transfers vertices
> to the
> + * GL will generate an INVALID_OPERATION error if the primitive mode
> parameter
> + * is incompatible with the input primitive type of the currently active
> + * program object, as discussed below."
> + *
> + * "Geometry shaders that operate on triangles are valid for the
> TRIANGLES,
> + * TRIANGLE_STRIP and TRIANGLE_FAN primitive types."
> + */
> +
> +#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(triangles, max_vertices = 3) out;\n"
> + "in vec3 pos[];\n"
> + "void main() {\n"
> + " for(int i = 0; i < pos.length(); 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(1.);\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + -1.0, 1.0, 0.0,
> + 1.0, 1.0, 0.0,
> + 1.0,-1.0, 0.0,
> + -1.0,-1.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0, 1, 2, 0, 2, 3
> +};
> +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);
> +}
> +
> +static GLenum valids[] = {GL_TRIANGLES, GL_TRIANGLE_STRIP,
> GL_TRIANGLE_FAN};
> +static GLenum invalids[] = {GL_POINTS, GL_LINES, GL_LINE_STRIP,
> GL_LINE_LOOP,
> + GL_LINES_ADJACENCY,
> GL_LINE_STRIP_ADJACENCY,
> + GL_TRIANGLES_ADJACENCY,
> + GL_TRIANGLE_STRIP_ADJACENCY};
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + for(i = 0; i < ARRAY_SIZE(valids); i++) {
> + glDrawElements(valids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> + }
> +
> + for(i = 0; i < ARRAY_SIZE(invalids); i++) {
> + glDrawElements(invalids[i], ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> + }
> +
> + 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/20130830/078a12a2/attachment-0001.html>
More information about the Piglit
mailing list