[Piglit] [PATCH 2/2] arb_texture_view: Add rendering test for layout consistency
Jon Ashburn
jon at lunarg.com
Tue Mar 25 14:27:44 PDT 2014
On 03/19/2014 03:17 AM, Chris Forbes wrote:
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
> tests/all.py | 1 +
> tests/spec/arb_texture_view/CMakeLists.gl.txt | 1 +
> .../arb_texture_view/format-consistency-render.c | 164 +++++++++++++++++++++
> 3 files changed, 166 insertions(+)
> create mode 100644 tests/spec/arb_texture_view/format-consistency-render.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 8e67eb0..a447b98 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -2007,6 +2007,7 @@ arb_texture_view['clear-into-view-2d-array'] = concurrent_test('arb_texture_view
> arb_texture_view['clear-into-view-layered'] = concurrent_test('arb_texture_view-clear-into-view-layered')
> arb_texture_view['copytexsubimage-layers'] = concurrent_test('arb_texture_view-copytexsubimage-layers')
> arb_texture_view['format-consistency-get'] = concurrent_test('arb_texture_view-format-consistency-get')
> +arb_texture_view['format-consistency-render'] = concurrent_test('arb_texture_view-format-consistency-render')
>
> tdfx_texture_compression_fxt1 = Group()
> spec['3DFX_texture_compression_FXT1'] = tdfx_texture_compression_fxt1
> diff --git a/tests/spec/arb_texture_view/CMakeLists.gl.txt b/tests/spec/arb_texture_view/CMakeLists.gl.txt
> index 1279fdc..0b13376 100644
> --- a/tests/spec/arb_texture_view/CMakeLists.gl.txt
> +++ b/tests/spec/arb_texture_view/CMakeLists.gl.txt
> @@ -28,5 +28,6 @@ piglit_add_executable(arb_texture_view-rendering-formats rendering-formats.c)
> piglit_add_executable(arb_texture_view-rendering-formats2 rendering-formats2.c)
> piglit_add_executable(arb_texture_view-copytexsubimage-layers copytexsubimage-layers.c common.c)
> piglit_add_executable(arb_texture_view-format-consistency-get format-consistency-get.c)
> +piglit_add_executable(arb_texture_view-format-consistency-render format-consistency-render.c)
>
> # vim: ft=cmake:
> diff --git a/tests/spec/arb_texture_view/format-consistency-render.c b/tests/spec/arb_texture_view/format-consistency-render.c
> new file mode 100644
> index 0000000..91a250b
> --- /dev/null
> +++ b/tests/spec/arb_texture_view/format-consistency-render.c
> @@ -0,0 +1,164 @@
> +/*
> + * Copyright © 2014 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.
> + *
> + * Author: Chris Forbes <chrisf at ijw.co.nz>
> + */
> +
> +/**
> + * Tests format consistency for texture views, across all formats in each view class.
> + * Based on the OpenGL 4.4 spec, section 8.26 "Texture Image Loads and Stores".
> + *
> + * Hardware will typically implement views by arranging for the memory layouts to
> + * be trivially aliasable, but the spec is written in terms of conversions via
> + * scratch memory.
> + *
> + * This test ensures that whatever the hardware is doing is consistent with the
> + * specified conversions.
> + */
> +
description differentiated from other consistency test
> +#include "piglit-util-gl-common.h"
> +#include "common.h"
> +#include "view-classes.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 30;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
add "bits" to your struct format_info and then don't need to pass the
"bits" parameter.
> +bool
> +do_test(int bits, struct format_info *fmt)
> +{
> + GLuint tex;
> + bool pass = true;
> +
> + /* reference pixel data -- up to 16 bytes */
> + char ref[] = {0x0f, 0x1e, 0x2d, 0x3c, 0x4b, 0x5a, 0x69, 0x78,
> + 0x87, 0x96, 0xa5, 0xb4, 0xc3, 0xd2, 0xe1, 0xf0};
> + float green[] = {0,1,0,0};
> +
> + printf("Testing %d bits class:\n", bits);
> +
> + glGenTextures(1, &tex);
> + glBindTexture(GL_TEXTURE_2D, tex);
> + glTexStorage2D(GL_TEXTURE_2D, 1, fmt->internalformat,
> + 1, 1);
> +
> + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1, 1,
> + fmt->pixelformat, fmt->pixeltype,
> + ref);
> +
> + for (; fmt->internalformat; fmt++) {
> + GLuint view, compare, prog;
> + char *fs;
> +
> + glGenTextures(1, &view);
> + glTextureView(view, GL_TEXTURE_2D, tex,
> + fmt->internalformat,
> + 0, 1, 0, 1);
> + glActiveTexture(GL_TEXTURE0);
> + glBindTexture(GL_TEXTURE_2D, view);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> +
> + glGenTextures(1, &compare);
> + glActiveTexture(GL_TEXTURE0 + 1);
> + glBindTexture(GL_TEXTURE_2D, compare);
> + glTexImage2D(GL_TEXTURE_2D, 0, fmt->internalformat,
> + 1, 1, 0, fmt->pixelformat, fmt->pixeltype,
> + ref);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> +
> + asprintf(&fs,
> + "#version 130\n"
> + "uniform %ssampler2D test, ref;\n"
> + "void main() {\n"
> + " vec2 tc = vec2(0,0);\n"
> + " if (texture(test, tc) != texture(ref, tc)) {\n"
> + " gl_FragColor = vec4(1,0,0,0);\n"
> + " } else {\n"
> + " gl_FragColor = vec4(0,1,0,0);\n"
> + " }\n"
> + "}\n", fmt->sampler_prefix);
> + prog = piglit_build_simple_program(
> + "#version 130\n"
> + "void main() {\n"
> + " gl_Position = gl_Vertex;\n"
> + "}\n",
> + fs);
> + free(fs);
> +
> + glUseProgram(prog);
> + glUniform1i(glGetUniformLocation(prog, "test"), 0);
> + glUniform1i(glGetUniformLocation(prog, "ref"), 1);
> +
> + glClearColor(0.2, 0.2, 0.2, 0.2);
> + glClear(GL_COLOR_BUFFER_BIT);
> + glViewport(0, 0, 64, 64);
> + piglit_draw_rect(-1, -1, 2, 2);
> +
> + if (!piglit_probe_pixel_rgba(32, 32, green)) {
> + pass = false;
> + piglit_report_subtest_result(PIGLIT_FAIL,
> + piglit_get_gl_enum_name(fmt->internalformat));
> + }
> + else {
> + piglit_report_subtest_result(PIGLIT_PASS,
> + piglit_get_gl_enum_name(fmt->internalformat));
> + }
> +
> + piglit_present_results();
> +
> + glUseProgram(0);
> + glDeleteProgram(prog);
> + glDeleteTextures(1, &compare);
> + glDeleteTextures(1, &view);
> + }
> +
> + glDeleteTextures(1, &tex);
> + return pass;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + pass = do_test(8, view_class_8bits) && pass;
> + pass = do_test(16, view_class_16bits) && pass;
> + pass = do_test(24, view_class_24bits) && pass;
> + pass = do_test(32, view_class_32bits) && pass;
> + pass = do_test(48, view_class_48bits) && pass;
> + pass = do_test(64, view_class_64bits) && pass;
> + pass = do_test(96, view_class_96bits) && pass;
> + pass = do_test(128, view_class_128bits) && pass;
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_ARB_texture_view");
also require texture_storage.
> +}
More information about the Piglit
mailing list