[Piglit] [PATCH piglit 1/3] Test GL_ARB_clear_texture using 3D textures
Brian Paul
brianp at vmware.com
Wed Jun 4 17:54:54 PDT 2014
I just did a quick review (you might wait to see if there's other
comments) but these tests look OK to me. Just a few minor things below.
Reviewed-by: Brian Paul <brianp at vmware.com>
On 06/04/2014 11:13 AM, Neil Roberts wrote:
> This adds a test for glClearTexSubImage when clearing a sub-region of
> a 3D texture. Two sub-regions are cleared, one using a NULL data
> parameter and one providing a colour. Both regions have a depth
> greater than 1. All of the images of the texture are then rendered to
> the window and probed for the correct results.
> ---
> tests/all.py | 1 +
> tests/spec/arb_clear_texture/3d.c | 238 +++++++++++++++++++++++++
> tests/spec/arb_clear_texture/CMakeLists.gl.txt | 1 +
> 3 files changed, 240 insertions(+)
> create mode 100644 tests/spec/arb_clear_texture/3d.c
>
> diff --git a/tests/all.py b/tests/all.py
> index a13d878..cac63da 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -3034,6 +3034,7 @@ add_concurrent_test(arb_clear_buffer_object, 'arb_clear_buffer_object-zero-size'
> arb_clear_texture = {}
> spec['ARB_clear_texture'] = arb_clear_texture
> add_concurrent_test(arb_clear_texture, 'arb_clear_texture-simple')
> +add_concurrent_test(arb_clear_texture, 'arb_clear_texture-3d')
>
> arb_copy_buffer = {}
> spec['ARB_copy_buffer'] = arb_copy_buffer
> diff --git a/tests/spec/arb_clear_texture/3d.c b/tests/spec/arb_clear_texture/3d.c
> new file mode 100644
> index 0000000..918d511
> --- /dev/null
> +++ b/tests/spec/arb_clear_texture/3d.c
> @@ -0,0 +1,238 @@
> +/*
> + * Copyright (c) 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.
> + */
> +
> +/** @file 3d.c
> + *
> + * A test of using glClearTexSubImage to clear sub-regions of a 3D
> + * texture. A 4x4x4 texture is created with all green data. The region
> + * 1x2x2+1+1+1 is cleared to zeroes by setting the data to NULL and
> + * the region 1x2x2+2+1+1 is cleared to red. All four 4x4 images are
> + * then drawn to the screen in left-to-right order.
> + */
> +
> +#define TEX_WIDTH 4
> +#define TEX_HEIGHT 4
> +#define TEX_DEPTH 4
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 20;
> +
> + config.window_width = (TEX_WIDTH * TEX_DEPTH);
> + config.window_height = TEX_HEIGHT;
Please use a window size at least as large as the default seen in
piglit-util-gl-common.h so that it works on Windows.
Same thing for the other patches too.
> + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const float green[3] = {0.0, 1.0, 0.0};
> +static const float red[3] = {1.0, 0.0, 0.0};
> +static const float black[3] = {0.0, 0.0, 0.0};
> +
> +static GLuint
> +create_texture(void)
> +{
> + GLubyte tex_data[TEX_WIDTH * TEX_HEIGHT * TEX_DEPTH * 3];
> + static const GLubyte green_bytes[3] = { 0x00, 0xff, 0x00 };
> + GLuint tex;
> + int i;
> +
> + for (i = 0; i < TEX_WIDTH * TEX_HEIGHT * TEX_DEPTH; i++)
> + memcpy(tex_data + i * 3, green_bytes, sizeof green_bytes);
glPixelStorei(GL_UNPACK_ALIGNMNET, 1), just to be safe.
> +
> + glGenTextures(1, &tex);
> + glBindTexture(GL_TEXTURE_3D, tex);
> + glTexImage3D(GL_TEXTURE_3D,
> + 0, /* level */
> + GL_RGB,
> + TEX_WIDTH, TEX_HEIGHT, TEX_DEPTH,
> + 0, /* border */
> + GL_RGB,
> + GL_UNSIGNED_BYTE,
> + tex_data);
> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> +
> + if (!piglit_check_gl_error(GL_NO_ERROR))
> + piglit_report_result(PIGLIT_FAIL);
> +
> + return tex;
> +}
> +
> +static void
> +clear_texture(GLuint tex)
> +{
> + glClearTexSubImage(tex,
> + 0, /* level */
> + 1, 1, 1, /* x/y/z */
> + 1, 2, 2, /* width/height/depth */
> + GL_RGB,
> + GL_UNSIGNED_BYTE,
> + NULL);
> + glClearTexSubImage(tex,
> + 0, /* level */
> + 2, 1, 1, /* x/y/z */
> + 1, 2, 2, /* width/height/depth */
> + GL_RGB,
> + GL_FLOAT,
> + red);
> +}
> +
> +static void
> +init_program(void)
> +{
> + GLuint prog;
> + GLuint tex_uniform;
> +
> + static const char vs_source[] =
> + "attribute vec2 piglit_vertex;\n"
> + "attribute vec3 piglit_texcoord;\n"
> + "varying vec3 tex_coord;\n"
> + "\n"
> + "void\n"
> + "main()\n"
You could do "void main()" as below.
> + "{\n"
> + " gl_Position = vec4(piglit_vertex, 0.0, 1.0);\n"
> + " tex_coord = piglit_texcoord;\n"
> + "}\n";
> + static const char fs_source[] =
> + "uniform sampler3D tex;\n"
> + "varying vec3 tex_coord;\n"
> + "\n"
> + "void main()\n"
> + "{\n"
> + " gl_FragColor = texture3D(tex, tex_coord);\n"
> + "}\n";
> +
> + prog = piglit_build_simple_program(vs_source, fs_source);
> +
> + tex_uniform = glGetUniformLocation(prog, "tex");
> +
> + glUseProgram(prog);
> +
> + glUniform1i(tex_uniform, 0);
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_ARB_clear_texture");
> +
> + init_program();
> +}
> +
> +static void
> +draw_rect(float x, float y, float width, float height, float tex_z)
> +{
> + struct {
> + float x, y;
> + float tx, ty, tz;
> + } attribs[] = {
> + { x, y, 0.0f, 0.0f, tex_z },
> + { x + width, y, 1.0f, 0.0f, tex_z },
> + { x, y + height, 0.0f, 1.0f, tex_z },
> + { x + width, y + height, 1.0f, 1.0f, tex_z },
> + };
> +
> + glEnableVertexAttribArray(PIGLIT_ATTRIB_POS);
> + glVertexAttribPointer(PIGLIT_ATTRIB_POS,
> + 2, /* size */
> + GL_FLOAT,
> + GL_FALSE, /* normalized */
> + sizeof attribs[0],
> + &attribs[0].x);
> + glEnableVertexAttribArray(PIGLIT_ATTRIB_TEX);
> + glVertexAttribPointer(PIGLIT_ATTRIB_TEX,
> + 3, /* size */
> + GL_FLOAT,
> + GL_FALSE, /* normalized */
> + sizeof attribs[0],
> + &attribs[0].tx);
> +
> + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
> +
> + glDisableVertexAttribArray(PIGLIT_ATTRIB_POS);
> + glDisableVertexAttribArray(PIGLIT_ATTRIB_TEX);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> + GLuint tex;
> + int i;
> +
> + tex = create_texture ();
Remove space before (
> +
> + if (!piglit_check_gl_error(GL_NO_ERROR))
> + piglit_report_result(PIGLIT_FAIL);
> +
> + clear_texture(tex);
> +
> + if (!piglit_check_gl_error(GL_NO_ERROR))
> + piglit_report_result(PIGLIT_FAIL);
> +
> + glBindTexture(GL_TEXTURE_3D, tex);
> +
> + /* Render all of the images to the screen */
> + for (i = 0; i < TEX_DEPTH; i++) {
> + draw_rect(i * 2.0f / TEX_DEPTH - 1.0f, -1.0f,
> + 2.0f / TEX_DEPTH, 2.0f,
> + i / (TEX_DEPTH - 1.0f));
> + }
> +
> + glBindTexture(GL_TEXTURE_3D, 0);
> +
> + glDeleteTextures(1, &tex);
> +
> + /* First image is all green */
> + pass &= piglit_probe_rect_rgb(0, 0, 4, 4, green);
> +
> + /* Second image is green with with a short black and red bar
> + * in the middle */
> + pass &= piglit_probe_rect_rgb(4, 0, 1, 4, green);
> + pass &= piglit_probe_pixel_rgb(5, 0, green);
> + pass &= piglit_probe_rect_rgb(5, 1, 1, 2, black);
> + pass &= piglit_probe_pixel_rgb(5, 3, green);
> + pass &= piglit_probe_pixel_rgb(6, 0, green);
> + pass &= piglit_probe_rect_rgb(6, 1, 1, 2, red);
> + pass &= piglit_probe_pixel_rgb(6, 3, green);
> + pass &= piglit_probe_rect_rgb(7, 0, 1, 4, green);
> + /* Third image is the same */
> + pass &= piglit_probe_rect_rgb(8, 0, 1, 4, green);
> + pass &= piglit_probe_pixel_rgb(9, 0, green);
> + pass &= piglit_probe_rect_rgb(9, 1, 1, 2, black);
> + pass &= piglit_probe_pixel_rgb(9, 3, green);
> + pass &= piglit_probe_pixel_rgb(10, 0, green);
> + pass &= piglit_probe_rect_rgb(10, 1, 1, 2, red);
> + pass &= piglit_probe_pixel_rgb(10, 3, green);
> + pass &= piglit_probe_rect_rgb(11, 0, 1, 4, green);
> +
> + /* Fourth image is all green */
> + pass &= piglit_probe_rect_rgb(12, 0, 4, 4, green);
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> diff --git a/tests/spec/arb_clear_texture/CMakeLists.gl.txt b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> index c77fd79..75ac54c 100644
> --- a/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> +++ b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> @@ -9,5 +9,6 @@ link_libraries (
> )
>
> piglit_add_executable (arb_clear_texture-simple simple.c)
> +piglit_add_executable (arb_clear_texture-3d 3d.c)
>
> # vim: ft=cmake:
>
More information about the Piglit
mailing list