[Piglit] [PATCH 2/3] GL 3.2: Test functionality of GetInteger64i_v()
Paul Berry
stereotype441 at gmail.com
Thu Aug 15 08:14:36 PDT 2013
On 12 August 2013 09:53, Nicholas Mack <nichmack at gmail.com> wrote:
> V2: Restructure the test into a loop to cycle through all buffers
> ---
> tests/spec/gl-3.2/CMakeLists.gl.txt | 2 +-
> tests/spec/gl-3.2/get-integer-64iv.c | 125
> +++++++++++++++++++++++++++++++++++
> 2 files changed, 126 insertions(+), 1 deletion(-)
> create mode 100644 tests/spec/gl-3.2/get-integer-64iv.c
>
> diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt
> b/tests/spec/gl-3.2/CMakeLists.gl.txt
> index bb0d008..2add6bf 100644
> --- a/tests/spec/gl-3.2/CMakeLists.gl.txt
> +++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
> @@ -11,5 +11,5 @@ link_libraries (
>
> piglit_add_executable (gl-3.2-minmax minmax.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)
>
Need to add this to all.tests.
> # vim: ft=cmake:
> diff --git a/tests/spec/gl-3.2/get-integer-64iv.c
> b/tests/spec/gl-3.2/get-integer-64iv.c
> new file mode 100644
> index 0000000..6af3727
> --- /dev/null
> +++ b/tests/spec/gl-3.2/get-integer-64iv.c
> @@ -0,0 +1,125 @@
> +/**
> + * 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 GetInteger64i_v()
> + *
> + * GL 3.2 core spec added GetInteger64i_v() in section 6.1.1(Simple
> Queries)
> + *
> + * GetInteger64i_v() queries an int64 value corresponding to the size or
> + * offset of the target buffer
> + *
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_core_version = 32;
> + config.supports_gl_compat_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + /* UNREACHED */
> + return PIGLIT_FAIL;
> +}
> +
> +static const struct {
> + GLenum target, start, size;
> +} test_vectors[] = {
> + {
> + GL_UNIFORM_BUFFER,
> + GL_UNIFORM_BUFFER_START,
> + GL_UNIFORM_BUFFER_SIZE
> + },
> + {
> + GL_TRANSFORM_FEEDBACK_BUFFER,
> + GL_TRANSFORM_FEEDBACK_BUFFER_START,
> + GL_TRANSFORM_FEEDBACK_BUFFER_SIZE
> + }
>
The mix of spaces and tabs here looks weird. Our normal practice would be
to simply indent the lines beginning with "GL_" with two tabs.
> +};
> +
> +GLint64 data = -2;
> +
> +int size = 3 * sizeof(int);
> +int offset = 0;
> +
> +int stuff[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
> +int sz = sizeof(stuff);
> +
> +GLuint idx = 0;
> +GLuint buff = 0;
> +
> +bool DoTest(GLuint buf, GLenum target, GLenum targStart, GLenum targSize)
> {
>
Normally we put the opening brace on its own line for functions.
> + bool pass = true;
> +
> + glBindBuffer(target, buf);
> + glBufferData(target, sz, stuff, GL_STATIC_READ);
> + glBindBufferRange(target, idx, buf, offset, size);
> +
> + glGetInteger64i_v(targStart, idx, &data);
> + if(data != offset) {
> + printf("%s was expected to be %d, but %d "
> + "was returned.\n",
> + piglit_get_gl_enum_name(target),
> + offset, (int)data);
> + pass = false;
> + }
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> + glGetInteger64i_v(targSize, idx, &data);
> + if(data != size) {
> + printf("%s was expected to be %d, but %d "
> + "was returned.\n",
> + piglit_get_gl_enum_name(target),
> + size, (int)data);
> + pass = false;
> + }
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> + return pass;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + bool pass = true;
> + int i = 0;
> +
> + glGenBuffers(1, &buff);
> +
> + for (i = 0; i < ARRAY_SIZE(test_vectors); i++) {
> + pass = DoTest(buff,
> + test_vectors[i].target,
> + test_vectors[i].start,
> + test_vectors[i].size)
> + && pass;
> + }
>
Looping through an array to test just two cases seems like more trouble
than it's worth. I would just do:
pass = DoTest(buff, GL_UNIFORM_BUFFER, GL_UNIFORM_BUFFER_START,
GL_UNIFORM_BUFFER_SIZE) && pass;
pass = DoTest(buff, GL_TRANSFORM_FEEDBACK_BUFFER,
GL_TRANSFORM_FEEDBACK_BUFFER_START,
GL_TRANSFORM_FEEDBACK_BUFFER_SIZE) && pass;
But I admit this is a nit-pick.
>
> +
> + pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> --
> 1.8.3.1
>
With the spaces/tabs fixed, and the test added to all.tests, this patch is:
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20130815/f487d186/attachment.html>
More information about the Piglit
mailing list