[Piglit] [PATCH 6/7] arb_texture_cube_map_array: add fbo test
Brian Paul
brianp at vmware.com
Thu Sep 6 08:07:28 PDT 2012
On 09/05/2012 09:34 PM, Dave Airlie wrote:
> This tests the glFramebufferTextureLayer interface.
>
> Signed-off-by: Dave Airlie<airlied at redhat.com>
> ---
> .../arb_texture_cube_map_array/CMakeLists.gl.txt | 1 +
> .../arb_texture_cube_map_array/fbo-cubemap-array.c | 297 ++++++++++++++++++++
> 2 files changed, 298 insertions(+), 0 deletions(-)
> create mode 100644 tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c
>
> diff --git a/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt b/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
> index 3d3f19b..6504834 100644
> --- a/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
> +++ b/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
> @@ -13,3 +13,4 @@ piglit_add_executable (arb_texture_cube_map_array-cubemap cubemap.c)
> piglit_add_executable (arb_texture_cube_map_array-teximage3d-invalid-values teximage3d-invalid-values.c)
> piglit_add_executable (arb_texture_cube_map_array-get get.c)
> piglit_add_executable (arb_texture_cube_map_array-sampler-cube-array-shadow sampler-cube-array-shadow.c)
> +piglit_add_executable (arb_texture_cube_map_array-fbo-cubemap-array fbo-cubemap-array.c)
> diff --git a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c
> new file mode 100644
> index 0000000..1185e9c
> --- /dev/null
> +++ b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c
> @@ -0,0 +1,297 @@
> +/*
> + * Copyright © 2009 Intel Corporation
> + * Copyright (c) 2010 VMware, Inc.
> + * Copyright © 2012 Red Hat 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
> + * 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.
> + *
> + * Authors:
> + * Dave Airlie
> + *
> + */
> +
> +/** @file fbo-cubemap-array.c
> + *
> + * Tests that drawing to each level of an cubemap array texture FBO and then
> + * drawing views * of those individual layerfaces to the window system framebuffer succeeds.
> + * based on fbo-array.c
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +#define BUF_WIDTH 32
> +#define BUF_HEIGHT 32
> +
> +PIGLIT_GL_TEST_MAIN(
> + 200 /*window_width*/,
> + 100 /*window_height*/,
> + GLUT_DOUBLE | GLUT_RGB)
> +
> +#define NUM_FACES 6
> +#define NUM_LAYERS 3
> +
> +float layer_color[NUM_LAYERS * NUM_FACES][4] = {
> + {1.0, 0.0, 0.0, 0.0},
> + {0.0, 1.0, 0.0, 0.0},
> + {0.0, 0.0, 1.0, 0.0},
> + {1.0, 0.0, 1.0, 0.0},
> + {1.0, 1.0, 0.0, 0.0},
> + {0.0, 1.0, 1.0, 0.0},
> +
> + {0.0, 1.0, 1.0, 0.0},
> + {1.0, 0.0, 0.0, 0.0},
> + {0.0, 1.0, 0.0, 0.0},
> + {0.0, 0.0, 1.0, 0.0},
> + {1.0, 0.0, 1.0, 0.0},
> + {1.0, 1.0, 0.0, 0.0},
> +
> + {1.0, 1.0, 0.0, 0.0},
> + {0.0, 1.0, 1.0, 0.0},
> + {1.0, 0.0, 0.0, 0.0},
> + {0.0, 1.0, 0.0, 0.0},
> + {0.0, 0.0, 1.0, 0.0},
> + {1.0, 0.0, 1.0, 0.0},
> +};
> +
> +int num_layers = NUM_LAYERS * NUM_FACES;
> +
> +static const char *prog = "fbo-cubemap-array";
> +/* debug aid */
> +static void
> +check_error(int line)
> +{
> + GLenum err = glGetError();
> + if (err) {
> + printf("%s: GL error 0x%x at line %d\n", prog, err, line);
> + }
> +}
Use piglit_check_gl_error(GL_NO_ERROR) instead?
> +
> +static const char *frag_shader_cube_array_text =
> + "#extension GL_ARB_texture_cube_map_array : enable \n"
I think you also need #version 130
> + "uniform samplerCubeArray tex; \n"
> + "void main() \n"
> + "{ \n"
> + " gl_FragColor = texture(tex, gl_TexCoord[0]); \n"
> + "} \n";
> +
> +static GLuint frag_shader_cube_array;
> +static GLuint program_cube_array;
> +
> +
> +static int
> +create_array_fbo(void)
> +{
> + GLuint tex, fb;
> + GLenum status;
> + int layer;
> +
> + glGenTextures(1,&tex);
> + glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, tex);
> + assert(glGetError() == 0);
> +
> + /* allocate empty array texture */
> + glTexImage3D(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, 0, GL_RGBA,
> + BUF_WIDTH, BUF_HEIGHT, num_layers,
> + 0,
> + GL_RGBA, GL_UNSIGNED_BYTE, NULL);
> + assert(glGetError() == 0);
> +
> + glGenFramebuffersEXT(1,&fb);
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
> +
> + /* draw something into each layer of the array texture */
> + for (layer = 0; layer< num_layers; layer++) {
> + glFramebufferTextureLayer(GL_FRAMEBUFFER_EXT,
> + GL_COLOR_ATTACHMENT0_EXT,
> + tex,
> + 0,
> + layer);
> +
> + assert(glGetError() == 0);
> +
> + status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT);
> + if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
> + fprintf(stderr, "FBO incomplete\n");
> + goto done;
Hmmm, should we report PIGLIT_FAIL or SKIP?
> + }
> +
> + glViewport(0, 0, BUF_WIDTH, BUF_HEIGHT);
> + piglit_ortho_projection(BUF_WIDTH, BUF_HEIGHT, GL_FALSE);
> +
> + /* solid color quad */
> + glColor4fv(layer_color[layer]);
> + piglit_draw_rect(-2, -2, BUF_WIDTH + 2, BUF_HEIGHT + 2);
> + }
> +
> +
> +done:
> + glDeleteFramebuffersEXT(1,&fb);
> + return tex;
> +}
> +
> +GLfloat a_cube_face_texcoords[6][4][4] = {
> + { /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
> + {1.0, 0.99, 0.99, 0.0},
> + {1.0, 0.99, -0.99, 0.0},
> + {1.0, -0.99, -0.99, 0.0},
> + {1.0, -0.99, 0.99, 0.0},
> + },
> + { /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
> + {-1.0, 0.99, -0.99, 0.0},
> + {-1.0, 0.99, 0.99, 0.0},
> + {-1.0, -0.99, 0.99, 0.0},
> + {-1.0, -0.99, -0.99, 0.0},
> + },
> + { /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
> + {-0.99, 1.0, -0.99, 0.0},
> + { 0.99, 1.0, -0.99, 0.0},
> + { 0.99, 1.0, 0.99, 0.0},
> + {-0.99, 1.0, 0.99, 0.0},
> + },
> + { /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
> + {-0.99, -1.0, 0.99, 0.0},
> + {-0.99, -1.0, -0.99, 0.0},
> + { 0.99, -1.0, -0.99, 0.0},
> + { 0.99, -1.0, 0.99, 0.0},
> + },
> + { /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
> + {-0.99, 0.99, 1.0, 0.0},
> + {-0.99, -0.99, 1.0, 0.0},
> + { 0.99, -0.99, 1.0, 0.0},
> + { 0.99, 0.99, 1.0, 0.0},
> + },
> +
> +
> + { /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
> + { 0.99, 0.99, -1.0, 0.0},
> + {-0.99, 0.99, -1.0, 0.0},
> + {-0.99, -0.99, -1.0, 0.0},
> + { 0.99, -0.99, -1.0, 0.0},
> + },
> +};
We've seen these coords before. I see that you're modifying the
coords below, but this array could be initialized by copying these
standard coords from a piglit helper array.
> +
> +
> +/* Draw a textured quad, sampling only the given layer of the
> + * array texture.
The given layer being face / 6?
When I see 'face' I think of a number in [0,5]. Maybe you could
explain that param a bit more. Maybe call it 'face_layer' or
something else?
> + */
> +static void
> +draw_layer(int x, int y, int face)
> +{
> + GLint realface = face % 6;
> + GLint layer = face / 6;
> + GLint loc;
> +
> + glUseProgram(program_cube_array);
> + loc = glGetUniformLocation(program_cube_array, "tex");
> + glUniform1i(loc, 0); /* texture unit p */
> +
> + glViewport(0, 0, piglit_width, piglit_height);
> + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
> +
> + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
> +
> + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
> + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
> + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
> + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARRAY_ARB, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
> + glBegin(GL_QUADS);
> +
> + a_cube_face_texcoords[realface][0][3] = layer;
> + a_cube_face_texcoords[realface][1][3] = layer;
> + a_cube_face_texcoords[realface][2][3] = layer;
> + a_cube_face_texcoords[realface][3][3] = layer;
> +
> + glTexCoord4fv(a_cube_face_texcoords[realface][0]);
> + glVertex2f(x, y);
> +
> + glTexCoord4fv(a_cube_face_texcoords[realface][1]);
> + glVertex2f(x + BUF_WIDTH, y);
> +
> + glTexCoord4fv(a_cube_face_texcoords[realface][2]);
> + glVertex2f(x + BUF_WIDTH, y + BUF_HEIGHT);
> +
> + glTexCoord4fv(a_cube_face_texcoords[realface][3]);
> + glVertex2f(x, y + BUF_HEIGHT);
> +
> + glEnd();
> +
> + glUseProgram(0);
> +}
> +
> +static GLboolean test_layer_drawing(int start_x, int start_y, float *expected)
> +{
> + return piglit_probe_rect_rgb(start_x, start_y, BUF_WIDTH, BUF_HEIGHT,
> + expected);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + GLboolean pass = GL_TRUE;
> + int layer;
> + GLuint tex;
> + int y;
> +
> + glClearColor(1.0, 1.0, 1.0, 1.0);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + tex = create_array_fbo();
> +
> + y = -1;
> + for (layer = 0; layer< num_layers; layer++) {
> + int x = 1 + (layer % 6) * (BUF_WIDTH + 1);
> + if (layer % 6 == 0)
> + y++;
> + draw_layer(x, y * BUF_HEIGHT, layer);
> +
> + }
Extra blank line above the }.
> +
> + y = -1;
> + for (layer = 0; layer< num_layers; layer++) {
> + int x = 1 + (layer % 6) * (BUF_WIDTH + 1);
> + if (layer % 6 == 0)
> + y++;
> + pass&= test_layer_drawing(x, y * BUF_HEIGHT, layer_color[layer]);
> + }
> +
> + glDeleteTextures(1,&tex);
> +
> + if (!piglit_automatic)
> + piglit_present_results();
I think you can omit the piglit_automatic check there.
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void piglit_init(int argc, char **argv)
> +{
> + piglit_require_extension("GL_ARB_texture_cube_map_array");
> +
> + /* Make shader programs */
> + frag_shader_cube_array =
> + piglit_compile_shader_text(GL_FRAGMENT_SHADER,
> + frag_shader_cube_array_text);
> + check_error(__LINE__);
> +
> + program_cube_array = piglit_link_simple_program(0, frag_shader_cube_array);
> + check_error(__LINE__);
> +
> +}
More information about the Piglit
mailing list