[Piglit] [PATCH] ext_texture_integer: add new tex formats test
Ilia Mirkin
imirkin at alum.mit.edu
Mon Aug 31 16:38:00 PDT 2015
On Mon, Aug 31, 2015 at 7:21 PM, Brian Paul <brianp at vmware.com> wrote:
> Test glTexImage2D() and glGetTexImage() with a variety of internalFormats
> and user formats/types.
>
> Note: currently fails with Mesa, passes with NVIDIA.
> ---
> tests/all.py | 1 +
> tests/spec/ext_texture_integer/CMakeLists.gl.txt | 1 +
> tests/spec/ext_texture_integer/texformats.c | 182 +++++++++++++++++++++++
> 3 files changed, 184 insertions(+)
> create mode 100644 tests/spec/ext_texture_integer/texformats.c
>
> diff --git a/tests/all.py b/tests/all.py
> index fe088f5..9320722 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -3127,6 +3127,7 @@ with profile.group_manager(
> g(['ext_texture_integer-getteximage-clamping'], 'getteximage-clamping')
> g(['ext_texture_integer-getteximage-clamping', 'GL_ARB_texture_rg'],
> 'getteximage-clamping GL_ARB_texture_rg')
> + g(['ext_texture_integer-texformats']),
> g(['ext_texture_integer-texture_integer_glsl130'],
> 'texture_integer_glsl130')
> g(['fbo-integer'], run_concurrent=False)
> diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
> index 44d9399..2932bc2 100644
> --- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
> +++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
> @@ -12,6 +12,7 @@ link_libraries (
>
> piglit_add_executable (ext_texture_integer-fbo-blending fbo-blending.c)
> piglit_add_executable (ext_texture_integer-fbo_integer_precision_clear fbo-integer-precision-clear.c)
> +piglit_add_executable (ext_texture_integer-texformats texformats.c)
> piglit_add_executable (ext_texture_integer-fbo_integer_readpixels_sint_uint fbo-integer-readpixels-sint-uint.c)
> piglit_add_executable (ext_texture_integer-getteximage-clamping getteximage-clamping.c)
> piglit_add_executable (ext_texture_integer-texture_integer_glsl130 texture-integer-glsl130.c)
> diff --git a/tests/spec/ext_texture_integer/texformats.c b/tests/spec/ext_texture_integer/texformats.c
> new file mode 100644
> index 0000000..5a4f387
> --- /dev/null
> +++ b/tests/spec/ext_texture_integer/texformats.c
> @@ -0,0 +1,182 @@
> +/*
> + * Copyright (c) 2015 VMware, Inc.
> + *
> + * 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
> + * on the rights to use, copy, modify, merge, publish, distribute, sub
> + * license, 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
> + * NON-INFRINGEMENT. IN NO EVENT SHALL VMWARE AND/OR THEIR SUPPLIERS
> + * 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 glTexImage2D and glGetTexImage with a variety of combinations of
> + * internal formats, and user-specified formats/types.
> + *
> + * Brian Paul
> + * 31 August 2015
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_compat_version = 10;
> + config.window_visual = PIGLIT_GL_VISUAL_RGBA;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +
> +static bool
> +test_format(GLenum intFormat, GLenum format, GLenum type)
> +{
> + const int width = 8, height = 8;
> + GLuint tex;
> + GLubyte *image, *getimage;
> + bool pass = true;
> + int i, bytes;
> +
> + switch (intFormat) {
> + case GL_ALPHA8I_EXT:
> + case GL_ALPHA8UI_EXT:
> + bytes = 1;
> + break;
> + case GL_ALPHA16I_EXT:
> + case GL_ALPHA16UI_EXT:
> + bytes = 2;
> + break;
> + case GL_ALPHA32I_EXT:
> + case GL_ALPHA32UI_EXT:
> + bytes = 4;
> + break;
> + case GL_RGB8I:
> + case GL_RGB8UI:
> + bytes = 3;
> + break;
> + case GL_RGBA8I:
> + case GL_RGBA8UI:
> + bytes = 4;
> + break;
> + case GL_RGB16I:
> + case GL_RGB16UI:
> + bytes = 6;
> + break;
> + case GL_RGBA16I:
> + case GL_RGBA16UI:
> + bytes = 8;
> + break;
> + case GL_RGB32I:
> + case GL_RGB32UI:
> + bytes = 12;
> + break;
> + case GL_RGBA32I:
> + case GL_RGBA32UI:
> + bytes = 16;
> + break;
> + default:
> + assert(!"Unexpected format");
> + bytes = 0;
> + }
> +
> + image = malloc(width * height * bytes);
> + for (i = 0; i < width * height * bytes; i++) {
> + image[i] = i % 255;
Any reason not to do % 256? Not that this is *too*
performance-sensitive, but... things like this pain me :)
> + }
> +
> + glGenTextures(1, &tex);
> + glBindTexture(GL_TEXTURE_2D, tex);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> +
> + glTexImage2D(GL_TEXTURE_2D, 0, intFormat, width, height, 0,
> + format, type, image);
> + if (!piglit_check_gl_error(GL_NO_ERROR)) {
> + pass = false;
> + }
> +
> + getimage = malloc(width * height * bytes);
> +
> + glGetTexImage(GL_TEXTURE_2D, 0, format, type, getimage);
> + if (!piglit_check_gl_error(GL_NO_ERROR)) {
> + pass = false;
> + }
> +
> + if (memcmp(image, getimage, width * height * bytes) != 0) {
> + pass = false;
> + }
> +
> + if (!pass) {
> + printf("Fail for intFormat=%s, format=%s, type=%s\n",
> + piglit_get_gl_enum_name(intFormat),
> + piglit_get_gl_enum_name(format),
> + piglit_get_gl_enum_name(type));
> + }
> +
> + glDeleteTextures(1, &tex);
> +
> + return pass;
> +}
> +
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + /* These format combinations should all work. But this list is
> + * not exhaustive.
> + */
> + static const GLenum formats[][3] = {
> + /* 8-bit/channel */
> + { GL_ALPHA8UI_EXT, GL_ALPHA_INTEGER, GL_UNSIGNED_BYTE },
> + { GL_ALPHA8I_EXT, GL_ALPHA_INTEGER, GL_BYTE },
> + { GL_RGB8UI, GL_RGB_INTEGER, GL_UNSIGNED_BYTE },
> + { GL_RGB8I, GL_RGB_INTEGER, GL_BYTE },
> + { GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE },
> + { GL_RGBA8I, GL_RGBA_INTEGER, GL_BYTE },
> + { GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8 },
> + { GL_RGBA8UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8_REV },
> + /* 16-bit */
> + { GL_ALPHA16UI_EXT, GL_ALPHA_INTEGER, GL_UNSIGNED_SHORT },
> + { GL_ALPHA16I_EXT, GL_ALPHA_INTEGER, GL_SHORT },
> + { GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT },
> + { GL_RGB16I, GL_RGB_INTEGER, GL_SHORT },
> + { GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT },
> + { GL_RGBA16I, GL_RGBA_INTEGER, GL_SHORT },
> + /* 32-bit */
> + { GL_ALPHA32UI_EXT, GL_ALPHA_INTEGER, GL_UNSIGNED_INT },
> + { GL_ALPHA32I_EXT, GL_ALPHA_INTEGER, GL_INT },
> + { GL_RGB32UI, GL_RGB_INTEGER, GL_UNSIGNED_INT },
> + { GL_RGB32I, GL_RGB_INTEGER, GL_INT },
> + { GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT },
> + { GL_RGBA32I, GL_RGBA_INTEGER, GL_INT }
> + };
> + int i;
> + bool pass = true;
> +
> + for (i = 0; i < ARRAY_SIZE(formats); i++) {
> + pass = test_format(formats[i][0], formats[i][1], formats[i][2])
> + && pass;
> + }
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
Does this draw anything? If not, should this all just be in
piglit_init? Otherwise you end up with a blank transparent window when
you don't do -auto, which can be confusing to see.
Also, isn't all this covered by the teximage-colors tests which I
thought were fairly exhaustive? Or do they not do integer textures and
this is just the same thing but for integer textures?
> +}
> +
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_EXT_texture_integer");
> +
> + glPixelStorei(GL_PACK_ALIGNMENT, 1);
> + glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
> +}
> --
> 1.9.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
More information about the Piglit
mailing list