[Piglit] [PATCH] GL_ARB_vertex_program: Add a tests for Mesa code I was changing.

[Eric Anholt]

Ian Romanick <idr at freedesktop.org> writes:

> One suggestion below.  Either way,
>
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
>
> On 09/21/2013 05:02 PM, Eric Anholt wrote:
>> ---
>>  tests/all.tests                                  |   2 +
>>  tests/spec/arb_vertex_program/CMakeLists.gl.txt  |   2 +
>>  tests/spec/arb_vertex_program/getlocal4-errors.c |  93 +++++++++++++++++++
>>  tests/spec/arb_vertex_program/getlocal4f-max.c   | 112 +++++++++++++++++++++++
>>  4 files changed, 209 insertions(+)
>>  create mode 100644 tests/spec/arb_vertex_program/getlocal4-errors.c
>>  create mode 100644 tests/spec/arb_vertex_program/getlocal4f-max.c
>> 
>> diff --git a/tests/all.tests b/tests/all.tests
>> index a308fce..092eb33 100644
>> --- a/tests/all.tests
>> +++ b/tests/all.tests
>> @@ -1525,6 +1525,8 @@ arb_vertex_program = Group()
>>  spec['ARB_vertex_program'] = arb_vertex_program
>>  arb_vertex_program['getenv4d-with-error'] = PlainExecTest(['arb_vertex_program-getenv4d-with-error', '-auto'])
>>  arb_vertex_program['getlocal4d-with-error'] = PlainExecTest(['arb_vertex_program-getlocal4d-with-error', '-auto'])
>> +arb_vertex_program['getlocal4f-max'] = concurrent_test('arb_vertex_program-getlocal4f-max')
>> +arb_vertex_program['getlocal4-errors'] = concurrent_test('arb_vertex_program-getlocal4-errors')
>>  arb_vertex_program['clip-plane-transformation arb'] = concurrent_test('clip-plane-transformation arb')
>>  arb_vertex_program['minmax'] = concurrent_test('arb_vertex_program-minmax')
>>  add_plain_test(arb_vertex_program, 'fdo24066')
>> diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
>> index 20b2614..197b20e 100644
>> --- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
>> +++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
>> @@ -11,6 +11,8 @@ link_libraries (
>>  
>>  piglit_add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
>>  piglit_add_executable (arb_vertex_program-getlocal4d-with-error getlocal4d-with-error.c)
>> +piglit_add_executable (arb_vertex_program-getlocal4f-max getlocal4f-max.c)
>> +piglit_add_executable (arb_vertex_program-getlocal4-errors getlocal4-errors.c)
>>  piglit_add_executable (arb_vertex_program-minmax minmax.c)
>>  
>>  # vim: ft=cmake:
>> diff --git a/tests/spec/arb_vertex_program/getlocal4-errors.c b/tests/spec/arb_vertex_program/getlocal4-errors.c
>> new file mode 100644
>> index 0000000..832cf9e
>> --- /dev/null
>> +++ b/tests/spec/arb_vertex_program/getlocal4-errors.c
>> @@ -0,0 +1,93 @@
>> +/*
>> + * 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 getlocal4-errors.c
>> + *
>> + * Tests that the specced errors are generated for
>> + * glGetProgramLocalParameter*ARB().
>> + *
>> + * From the GL_ARB_vertex_program spec:
>> + *
>> + *     "The error INVALID_ENUM is generated if <target> specifies a
>> + *      nonexistent program target or a program target that does not
>> + *      support program local parameters.  The error INVALID_VALUE is
>> + *      generated if <index> is greater than or equal to the
>> + *      implementation-dependent number of supported program local
>> + *      parameters for the program target."
>> + */
>> +
>> +#include "piglit-util-gl-common.h"
>> +
>> +PIGLIT_GL_TEST_CONFIG_BEGIN
>> +
>> +	config.supports_gl_compat_version = 10;
>> +
>> +	config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
>> +
>> +PIGLIT_GL_TEST_CONFIG_END
>> +
>> +void
>> +piglit_init(int argc, char **argv)
>> +{
>> +	const char *source =
>> +		"!!ARBvp1.0\n"
>> +		"OPTION ARB_position_invariant;\n"
>> +		"MOV result.color, program.local[3];\n"
>> +		"END\n";
>> +	GLuint prog;
>> +	GLint max_local;
>> +	float fvalues[4];
>> +	double dvalues[4];
>> +
>> +	piglit_require_extension("GL_ARB_vertex_program");
>> +
>> +	prog = piglit_compile_program(GL_VERTEX_PROGRAM_ARB, source);
>> +	glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog);
>> +
>> +	glGetProgramiv(GL_VERTEX_PROGRAM_ARB,
>> +		       GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &max_local);
>> +
>> +	/* Check that an error is generated for going beyond max. */
>> +	glGetProgramLocalParameterfvARB(GL_VERTEX_PROGRAM_ARB, max_local,
>> +					fvalues);
>> +	piglit_check_gl_error(GL_INVALID_VALUE);
>> +
>> +	glGetProgramLocalParameterdvARB(GL_VERTEX_PROGRAM_ARB, max_local,
>> +					dvalues);
>> +	piglit_check_gl_error(GL_INVALID_VALUE);
>
> Maybe check that max_local-1 doesn't generate an error?

We've got that for GLPfv in the other test, and I think if we care about
storage testing for GLPdv we should port the other test to it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20130925/89f0c22c/attachment.pgp>