[Piglit] [PATCH] GL: Verify that when GL_COORD_REPLACE is set, fragment shader texture coordinates do not get eliminated.
Anuj Phogat
anuj.phogat at gmail.com
Tue Nov 12 12:36:26 PST 2013
On Mon, Nov 11, 2013 at 11:44 AM, Nicholas Mack <nichmack at gmail.com> wrote:
> ---
> tests/all.tests | 2 +-
> tests/spec/gl-3.2/CMakeLists.gl.txt | 3 +-
> ...oord-replace-doesnt-eliminate-frag-tex-coords.c | 135 +++++++++++++++++++++
> 3 files changed, 138 insertions(+), 2 deletions(-)
> create mode 100644 tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index af5dcf3..d34773b 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -765,7 +765,7 @@ spec['!OpenGL 3.2/layered-rendering/gl-layer'] = concurrent_test('gl-3.2-layered
> spec['!OpenGL 3.2/layered-rendering/gl-layer-cube-map'] = concurrent_test('gl-3.2-layered-rendering-gl-layer-cube-map')
> spec['!OpenGL 3.2/layered-rendering/gl-layer-not-layered'] = concurrent_test('gl-3.2-layered-rendering-gl-layer-not-layered')
> spec['!OpenGL 3.2/layered-rendering/gl-layer-render'] = concurrent_test('gl-3.2-layered-rendering-gl-layer-render')
> -
> +spec['!OpenGL/coord-replace-doesnt-eliminate-frag-tex-coords'] = concurrent_test('gl-coord-replace-doesnt-eliminate-frag-tex-coords')
> spec['!OpenGL/get-active-attrib-returns-all-inputs'] = concurrent_test('gl-get-active-attrib-returns-all-inputs')
> spec['!OpenGL 3.2/texture-border-deprecated'] = concurrent_test('gl-3.2-texture-border-deprecated')
>
> diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
> index 1457681..c8725be 100644
> --- a/tests/spec/gl-3.2/CMakeLists.gl.txt
> +++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
> @@ -9,11 +9,12 @@ link_libraries (
> ${OPENGL_glu_LIBRARY}
> )
>
> -piglit_add_executable (gl-get-active-attrib-returns-all-inputs get-active-attrib-returns-all-inputs.c)
> piglit_add_executable (gl-3.2-minmax minmax.c)
> piglit_add_executable (gl-3.2-clear-no-buffers clear-no-buffers.c)
> piglit_add_executable (gl-3.2-get-buffer-parameter-i64v get-buffer-parameter-i64v.c)
> piglit_add_executable (gl-3.2-get-integer-64iv get-integer-64iv.c)
> piglit_add_executable (gl-3.2-get-integer-64v get-integer-64v.c)
> piglit_add_executable (gl-3.2-texture-border-deprecated texture-border-deprecated.c)
> +piglit_add_executable (gl-coord-replace-doesnt-eliminate-frag-tex-coords gl-coord-replace-doesnt-eliminate-frag-tex-coords)
> +piglit_add_executable (gl-get-active-attrib-returns-all-inputs get-active-attrib-returns-all-inputs.c)
> # vim: ft=cmake:
> diff --git a/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
> new file mode 100644
> index 0000000..b07327c
> --- /dev/null
> +++ b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
> @@ -0,0 +1,135 @@
> +/**
> + * 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.
> + */
> +
> +/**
> + * Verify that when GL_COORD_REPLACE is set, fragment shader texture
> + * coordinates (via the gl_TexCoord built-ins) don't get eliminated.
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 21;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const char *vstext =
> + "#version 130\n"
> + "in vec3 vertex;\n"
> + "void main() {\n"
> + " gl_Position = vec4(vertex, 1.);\n"
> + " gl_PointSize = 16;\n"
> + "}\n";
> +
> +static const char *fstext =
> + "#version 130\n"
> + "void main() {\n"
> + " gl_FragColor = gl_TexCoord[0];\n"
> + "}\n";
> +
> +static GLuint vao;
> +static GLuint vertBuff;
> +static GLuint indexBuf;
> +
> +static GLfloat vertices[] = {
> + 0.0, 0.0, 0.0
> +};
> +static GLsizei vertSize = sizeof(vertices);
> +
> +static GLuint indices[] = {
> + 0
> +};
> +static GLsizei indSize = sizeof(indices);
> +
> +static GLuint prog;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + GLuint vertIndex;
> +
> + prog = piglit_build_simple_program(vstext, fstext);
> +
> + 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);
This call is redundant. You've already set the GL_ARRAY_BUFFER above.
> + glEnableVertexAttribArray(vertIndex);
> + glVertexAttribPointer(vertIndex, 3, GL_FLOAT, GL_FALSE, 0, 0);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + int x, y;
> + int ptSize = 16;
> +
> + glClearColor(.4, .4, .4, 1.);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + glBindVertexArray(vao);
> + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBuf);
> +
> + glEnable(GL_PROGRAM_POINT_SIZE);
> + glEnable(GL_POINT_SPRITE);
> + glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE);
> +
> + glDrawElements(GL_POINTS, ARRAY_SIZE(indices),
> + GL_UNSIGNED_INT, NULL);
> +
> + for (y = 0; y < ptSize; y++) {
> + for (x = 0; x < ptSize; x++) {
> + float test[] = {(2 * x + 1) / (float)(ptSize * 2),
> + 1 - ((2 * y + 1) / (float)(ptSize * 2)),
> + 0};
> + pass = piglit_probe_pixel_rgb(
> + piglit_width/2 - ptSize/2 + x,
> + piglit_height/2 - ptSize/2 + y,
> + test)
> + && 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
With above comment fixed, this patch is:
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
More information about the Piglit
mailing list