[Piglit] [PATCH] Add glGetActiveAttrib test.
Paul Berry
stereotype441 at gmail.com
Tue Jul 30 09:58:26 PDT 2013
On 19 July 2013 13:09, Jacob Penner <jkpenner91 at gmail.com> wrote:
> Test that the size value returned from glGetActiveAttrib is correct
> for arrays of various sizes.
>
I'd recommend changing the commit subject to "Add glGetActiveAttrib test
for arrays", just so people aren't confused (we already have a more general
test for glGetActiveAttrib).
> ---
> tests/spec/CMakeLists.txt | 1 +
> tests/spec/glsl-1.50/CMakeLists.txt | 1 +
> tests/spec/glsl-1.50/execution/CMakeLists.gl.txt | 13 ++
> tests/spec/glsl-1.50/execution/CMakeLists.txt | 1 +
> .../glsl-1.50/execution/get-active-attrib-array.c | 141
> +++++++++++++++++++++
> 5 files changed, 157 insertions(+)
> create mode 100644 tests/spec/glsl-1.50/CMakeLists.txt
> create mode 100644 tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> create mode 100644 tests/spec/glsl-1.50/execution/CMakeLists.txt
> create mode 100644
> tests/spec/glsl-1.50/execution/get-active-attrib-array.c
>
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index 4ca366b..b380e17 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -54,6 +54,7 @@ add_subdirectory (glsl-1.10)
> add_subdirectory (glsl-1.20)
> add_subdirectory (glsl-1.30)
> add_subdirectory (glsl-1.40)
> +add_subdirectory (glsl-1.50)
> add_subdirectory (glsl-es-3.00)
> add_subdirectory (gl-1.0)
> add_subdirectory (gl-2.0)
> diff --git a/tests/spec/glsl-1.50/CMakeLists.txt
> b/tests/spec/glsl-1.50/CMakeLists.txt
> new file mode 100644
> index 0000000..bb76f08
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/CMakeLists.txt
> @@ -0,0 +1 @@
> +add_subdirectory (execution)
> diff --git a/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..c15eece
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
> @@ -0,0 +1,13 @@
> +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-get-active-attrib-array
> get-active-attrib-array.c)
> diff --git a/tests/spec/glsl-1.50/execution/CMakeLists.txt
> b/tests/spec/glsl-1.50/execution/CMakeLists.txt
> new file mode 100644
> index 0000000..144a306
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
> b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
> new file mode 100644
> index 0000000..9f93c65
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
> @@ -0,0 +1,141 @@
> +/*
> + * Copyright © 2012 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.
> + */
> +
> +/*
> + * Check that glGetActiveAttrib returns the correct size values,
> + * for arrays of various sizes.
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +//config.supports_gl_core_version = 32;
> +
> + config.supports_gl_compat_version = 10;
>
Array support for vertex attributes only appears in GL 3.2, so this should
be:
config.supports_gl_core_version = 32;
config.supports_gl_compat_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const char *vs_source =
> + "#version 150\n"
> + "in int a[1];\n"
> + "in int b[2];\n"
> + "in int c[3];\n"
> + "in int d[4];\n"
> + "in int e[5];\n"
> + "\n"
> + "out vec4 color;\n"
> + "void main()\n"
> + "{\n"
> + " color = vec4(a[0] + b[0] + b[1],\n"
> + " c[0] + c[1] + c[2],\n"
> + " d[0] + d[1] + d[2] + d[3],\n"
> + " e[0] + e[1] + e[2] + e[3] + e[4]);\n"
> + "}\n";
> +
> +static const char *fs_source =
> + "#version 150\n"
> + "in vec4 color;\n"
> + "void main()\n"
> + "{\n"
> + " gl_FragColor = color;\n"
> + "}\n";
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + /* UNREACHED */
> + return PIGLIT_FAIL;
> +}
> +
> +/*
> + * Find the given attribute size then, check if the passed expected size
> + * is equal to the actual size.
> + */
> +bool
> +getAttribLocTest(GLint program, int active_attribs, int max_name_length,
> + char *attrib_name, int expected_size)
> +{
> + bool pass = true;
> + int size = -1;
> + GLenum type = GL_NONE;
> + char *name = malloc(max_name_length-1);
> +
> + int i;
> + for(i = 0; i < active_attribs; i++)
> + {
>
The formatting convention we use in Piglit is for the opening brace to go
on the same line as a "for" or "if" statement. So this should be:
for (i = 0; i < active_attribs; i++) {
> + glGetActiveAttrib(program, i, max_name_length,
> + NULL, &size, &type, name);
> +
> +
> + if(strcmp(attrib_name, name) == 0)
> + {
> + // exit out of for loop
> + i = active_attribs;
> + }
>
The conventional way to do this is:
if(strcmp(attrib_name, name) == 0)
break;
> + }
>
If we get through the loop without finding an attribute matching
attrib_name, we ought to report an error at this point. I'd recommend
adding something like the following:
if (i != active_attribs) {
printf("Attribute '%s' not found\n", attrib_name);
pass = false;
}
(This assumes you take my advice about using "break")
> +
> + if(!pass)
> + {
> + printf("Attribute '%s': size %d; expected %d\n",
> + name, size, expected_size);
> + }
> +
> + pass = (size == expected_size)?(true):(false);
>
You're checking "pass" before setting it, so the printf will never happen.
I'd recommend changing this to:
if (size != expected_size) {
printf(...);
pass = false;
}
> +
> + return pass;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + bool pass = true;
> +
> + GLint prog = 0;
> +
> + GLint active_attribs = 0;
> + GLint max_length = 0;
> +
> + piglit_require_GLSL_version(150);
> +
> + prog = piglit_build_simple_program(vs_source, fs_source);
> +
> + glLinkProgram(prog);
>
piglit_build_simple_program() automatically calls glLinkProgram() so this
is unnecessary.
> + glUseProgram(prog);
> +
> + glGetProgramiv(prog, GL_ACTIVE_ATTRIBUTES, &active_attribs);
> + glGetProgramiv(prog, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &max_length);
> +
> + /*
> + * Check the size of the given attribute with the
> + * corresponding expected array size.
> + */
> + pass = getAttribLocTest(prog, active_attribs, max_length, "a", 1)
> && pass;
> + pass = getAttribLocTest(prog, active_attribs, max_length, "b", 2)
> && pass;
> + pass = getAttribLocTest(prog, active_attribs, max_length, "c", 3)
> && pass;
> + pass = getAttribLocTest(prog, active_attribs, max_length, "d", 4)
> && pass;
> + pass = getAttribLocTest(prog, active_attribs, max_length, "e", 5)
> && pass;
> +
> + glDeleteProgram(prog);
> +
> + piglit_report_result(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/20130730/d265c4c6/attachment.html>
More information about the Piglit
mailing list