[Piglit] [PATCH 08/10] fbo-generatemipmap-3d: new test for 3D mipmap generation
Marek Olšák
maraeo at gmail.com
Thu Mar 20 17:53:24 PDT 2014
The generatemipmap tests are capable of testing any RGB and RGBA
format. Testing more formats might be interesting, but I don't find it
important at the moment. I chose the 3 formats (2 for 3D and 1D)
because there are 3 different functions for generating mipmaps in
Mesa:
1) GL_RGBA8: u_gen_mipmap
2) GL_RGB9_E5: _mesa_generate_mipmap/generate_mipmap_uncompressed
3) GL_COMPRESSED_RGB_...: _mesa_generate_mipmap/generate_mipmap_compressed
I wasn't interested in whether those 3 formats work. I was only
interested in whether those 3 functions work.
Marek
On Mon, Mar 17, 2014 at 4:08 PM, Brian Paul <brianp at vmware.com> wrote:
> Two very minor nits (applies to other tests too).
>
>
>
> On 03/15/2014 10:53 AM, Marek Olšák wrote:
>>
>> From: Marek Olšák <marek.olsak at amd.com>
>>
>> ---
>> tests/all.py | 2 +
>> tests/fbo/CMakeLists.gl.txt | 1 +
>> tests/fbo/fbo-generatemipmap-3d.c | 308
>> ++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 311 insertions(+)
>> create mode 100644 tests/fbo/fbo-generatemipmap-3d.c
>>
>> diff --git a/tests/all.py b/tests/all.py
>> index 4ec9c4b..6082c0a 100644
>> --- a/tests/all.py
>> +++ b/tests/all.py
>> @@ -1687,6 +1687,8 @@ add_concurrent_test(arb_framebuffer_object,
>> 'fbo-generatemipmap-cubemap RGB9_E5'
>> add_concurrent_test(arb_framebuffer_object, 'fbo-generatemipmap-cubemap
>> S3TC_DXT1')
>> add_concurrent_test(arb_framebuffer_object, 'fbo-generatemipmap-1d')
>> add_concurrent_test(arb_framebuffer_object, 'fbo-generatemipmap-1d
>> RGB9_E5')
>> +add_concurrent_test(arb_framebuffer_object, 'fbo-generatemipmap-3d')
>> +add_concurrent_test(arb_framebuffer_object, 'fbo-generatemipmap-3d
>> RGB9_E5')
>>
>> # Group ARB_framebuffer_sRGB
>> arb_framebuffer_srgb = Group()
>> diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
>> index 19b21c3..7171d8d 100644
>> --- a/tests/fbo/CMakeLists.gl.txt
>> +++ b/tests/fbo/CMakeLists.gl.txt
>> @@ -55,6 +55,7 @@ piglit_add_executable (fbo-fragcoord fbo-fragcoord.c)
>> piglit_add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
>> piglit_add_executable (fbo-generatemipmap fbo-generatemipmap.c)
>> piglit_add_executable (fbo-generatemipmap-1d fbo-generatemipmap-1d.c)
>> +piglit_add_executable (fbo-generatemipmap-3d fbo-generatemipmap-3d.c)
>> piglit_add_executable (fbo-generatemipmap-array
>> fbo-generatemipmap-array.c)
>> piglit_add_executable (fbo-generatemipmap-cubemap
>> fbo-generatemipmap-cubemap.c)
>> piglit_add_executable (fbo-generatemipmap-filtering
>> fbo-generatemipmap-filtering.c)
>> diff --git a/tests/fbo/fbo-generatemipmap-3d.c
>> b/tests/fbo/fbo-generatemipmap-3d.c
>> new file mode 100644
>> index 0000000..924a96d
>> --- /dev/null
>> +++ b/tests/fbo/fbo-generatemipmap-3d.c
>> @@ -0,0 +1,308 @@
>> +/*
>> + * Copyright © 2014 Advanced Micro Devices, 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:
>> + * Marek Olšák <maraeo at gmail.com>
>> + */
>> +
>> +#include "piglit-util-gl-common.h"
>> +
>> +#define TEX_SIZE 32
>> +#define TEX_LEVELS 6
>> +
>> +#define DRAW_SIZE 32
>> +
>> +PIGLIT_GL_TEST_CONFIG_BEGIN
>> +
>> + config.supports_gl_compat_version = 10;
>
>
> If you're using shaders, I think this should be 20.
>
>
>
>> +
>> + config.window_width = 600;
>> + config.window_height = 300;
>> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE |
>> PIGLIT_GL_VISUAL_RGBA;
>> +
>> +PIGLIT_GL_TEST_CONFIG_END
>> +
>> +static const char *fs_3d =
>> + "uniform sampler3D tex; \n"
>> + "void main() \n"
>> + "{ \n"
>> + " gl_FragColor = texture3D(tex, gl_TexCoord[0].xyz); \n"
>> + "} \n";
>> +
>> +static GLuint prog;
>> +static GLenum format;
>> +
>> +static float colors[][4] = {
>> + {0.0, 0.0, 0.0, 1.0},
>> + {1.0, 0.0, 0.0, 1.0},
>> + {0.0, 1.0, 0.0, 1.0},
>> + {1.0, 1.0, 0.0, 1.0},
>> + {0.0, 0.0, 1.0, 1.0},
>> + {1.0, 0.0, 1.0, 1.0},
>> + {0.0, 1.0, 1.0, 1.0},
>> + {1.0, 1.0, 1.0, 1.0},
>> +};
>> +
>> +static void
>> +gen_level(int level, float *p)
>> +{
>> + int size = TEX_SIZE >> level;
>> + int x,y,z,i,c;
>> +
>> + if (size == 1) {
>> + memset(p, 0, 4 * sizeof(float));
>> +
>> + /* Average all colors. */
>> + for (i = 0; i < 8; i++)
>> + for (c = 0; c < 4; c++)
>> + p[c] += colors[i][c] * 0.125;
>> + return;
>> + }
>> +
>> + for (z = 0; z < size; z++) {
>> + for (y = 0; y < size; y++) {
>> + for (x = 0; x < size; x++) {
>> + int octant = (z >= size/2)*4 +
>> + (y >= size/2)*2 +
>> + (x >= size/2);
>> + float *dest = &p[(z*size*size + y*size +
>> x)*4];
>> +
>> + memcpy(dest, colors[octant], 4 *
>> sizeof(float));
>> + }
>> + }
>> + }
>> +}
>> +
>> +static int
>
>
> GLuint
>
>
>
>> +create_tex3d(void)
>> +{
>> + GLuint tex;
>> + float *p;
>> +
>> + glGenTextures(1, &tex);
>> + glBindTexture(GL_TEXTURE_3D, tex);
>> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER,
>> GL_NEAREST_MIPMAP_NEAREST);
>> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>> + glTexStorage3D(GL_TEXTURE_3D, TEX_LEVELS, format,
>> + TEX_SIZE, TEX_SIZE, TEX_SIZE);
>> +
>> + p = malloc(TEX_SIZE * TEX_SIZE * TEX_SIZE * 4 * sizeof(float));
>> + gen_level(0, p);
>> +
>> + glTexSubImage3D(GL_TEXTURE_3D, 0, 0, 0, 0, TEX_SIZE, TEX_SIZE,
>> TEX_SIZE,
>> + GL_RGBA, GL_FLOAT, p);
>> + free(p);
>> +
>> + glGenerateMipmap(GL_TEXTURE_3D);
>> + return tex;
>> +}
>> +
>> +static void
>> +piglit_draw_rect_tex3(float x, float y, float w, float h,
>> + float tx, float ty, float tw, float th, float td)
>> +{
>> + float verts[4][4];
>> + float tex[4][3];
>> +
>> + verts[0][0] = x;
>> + verts[0][1] = y;
>> + verts[0][2] = 0.0;
>> + verts[0][3] = 1.0;
>> + tex[0][0] = tx;
>> + tex[0][1] = ty;
>> + tex[0][2] = td;
>> + verts[1][0] = x + w;
>> + verts[1][1] = y;
>> + verts[1][2] = 0.0;
>> + verts[1][3] = 1.0;
>> + tex[1][0] = tx + tw;
>> + tex[1][1] = ty;
>> + tex[1][2] = td;
>> + verts[2][0] = x + w;
>> + verts[2][1] = y + h;
>> + verts[2][2] = 0.0;
>> + verts[2][3] = 1.0;
>> + tex[2][0] = tx + tw;
>> + tex[2][1] = ty + th;
>> + tex[2][2] = td;
>> + verts[3][0] = x;
>> + verts[3][1] = y + h;
>> + verts[3][2] = 0.0;
>> + verts[3][3] = 1.0;
>> + tex[3][0] = tx;
>> + tex[3][1] = ty + th;
>> + tex[3][2] = td;
>> +
>> + glVertexPointer(4, GL_FLOAT, 0, verts);
>> + glTexCoordPointer(3, GL_FLOAT, 0, tex);
>> + glEnableClientState(GL_VERTEX_ARRAY);
>> + glEnableClientState(GL_TEXTURE_COORD_ARRAY);
>> +
>> + glDrawArrays(GL_QUADS, 0, 4);
>> +
>> + glDisableClientState(GL_VERTEX_ARRAY);
>> + glDisableClientState(GL_TEXTURE_COORD_ARRAY);
>> +}
>> +
>> +static void
>> +draw_slice(int x, int y, float z)
>> +{
>> + int loc;
>> +
>> + glUseProgram(prog);
>> + loc = glGetUniformLocation(prog, "tex");
>> + glUniform1i(loc, 0); /* texture unit p */
>> +
>> + glViewport(0, 0, piglit_width, piglit_height);
>> + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>> +
>> + glBindFramebuffer(GL_FRAMEBUFFER, piglit_winsys_fbo);
>> +
>> + piglit_draw_rect_tex3(x, y, DRAW_SIZE, DRAW_SIZE, 0, 0, 1, 1, z);
>> + glUseProgram(0);
>> +}
>> +
>> +static void
>> +draw_mipmap_tree(int x, int y)
>> +{
>> + int z, level;
>> +
>> + for (level = 0; level < TEX_LEVELS; level++) {
>> + int size = TEX_SIZE >> level;
>> +
>> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_LOD, level);
>> + glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAX_LOD, level);
>> +
>> + for (z = 0; z < size; z++) {
>> + if (level == 0) {
>> + draw_slice(x + (z % (TEX_SIZE/2)) *
>> (DRAW_SIZE + 5),
>> + y + (z / (TEX_SIZE/2)) *
>> (DRAW_SIZE + 5),
>> + z / (float)size);
>> + }
>> + else {
>> + draw_slice(x + z * (DRAW_SIZE + 5),
>> + y + (level + 1) * (DRAW_SIZE +
>> 10),
>> + z / (float)size);
>> + }
>> + }
>> + }
>> +}
>> +
>> +static bool
>> +test_box(int level)
>> +{
>> + int size = TEX_SIZE >> level;
>> + int z,x,y,i;
>> + bool pass = true;
>> + float *e, *observed;
>> +
>> + observed = malloc(size * size * size * 4 * sizeof(float));
>> + glGetTexImage(GL_TEXTURE_3D, level, GL_RGBA, GL_FLOAT, observed);
>> +
>> + e = malloc(size * size * size * 4 * sizeof(float));
>> + gen_level(level, e);
>> +
>> + for (z = 0; z < size; z++) {
>> + for (y = 0; y < size; y++) {
>> + for (x = 0; x < size; x++) {
>> + float *probe = &observed[(y*size+x)*4];
>> + float *expected = &e[(y*size+x)*4];
>> +
>> + for (i = 0; i < 4; ++i) {
>> + if (fabs(probe[i] - expected[i])
>> >= piglit_tolerance[i]) {
>> + printf("Probe color at
>> (%i,%i,%i)\n", x, y, z);
>> + printf(" Expected: %f %f
>> %f %f\n",
>> + expected[0],
>> expected[1], expected[2], expected[3]);
>> + printf(" Observed: %f %f
>> %f %f\n",
>> + probe[0], probe[1],
>> probe[2], probe[3]);
>> + printf(" when testing
>> level %i\n", level);
>> + pass = false;
>> + goto done;
>> + }
>> + }
>> + }
>> + }
>> + }
>> +
>> +done:
>> + free(e);
>> + free(observed);
>> + return pass;
>> +}
>> +
>> +static bool
>> +test_mipmap_tree(void)
>> +{
>> + bool pass = true;
>> + int level;
>> +
>> + for (level = 0; level < TEX_LEVELS; level++) {
>> + pass = pass && test_box(level);
>> + }
>> +
>> + return pass;
>> +}
>> +
>> +enum piglit_result
>> +piglit_display(void)
>> +{
>> + GLboolean pass = GL_TRUE;
>> + GLuint tex;
>> +
>> + glClear(GL_COLOR_BUFFER_BIT);
>> +
>> + tex = create_tex3d();
>> +
>> + draw_mipmap_tree(5, 5);
>> +
>> + pass = test_mipmap_tree();
>> +
>> + glDeleteTextures(1, &tex);
>> + piglit_present_results();
>> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
>> +}
>> +
>> +void piglit_init(int argc, char **argv)
>> +{
>> + int i;
>> +
>> + piglit_require_extension("GL_ARB_framebuffer_object");
>> + piglit_require_extension("GL_ARB_texture_storage");
>> + piglit_require_GLSL_version(120);
>> +
>> + format = GL_RGBA8;
>> +
>> + for (i = 1; i < argc; i++) {
>> + if (strcmp(argv[i], "RGB9_E5") == 0) {
>> + /* Test a non-renderable format. */
>> +
>> piglit_require_extension("GL_EXT_texture_shared_exponent");
>> + format = GL_RGB9_E5;
>> + }
>> + else {
>> + assert(0);
>> + }
>> + }
>
>
> It might be nice if you could pass other internal formats to the test,
> GL_RGB5, GL_RGB32F, etc. but that can make probing more difficult.
>
>
>
>> +
>> + prog = piglit_build_simple_program(NULL, fs_3d);
>> +
>> + glClearColor(0.25, 0.25, 0.25, 0.25);
>> +}
>>
>
>
> This all looks great otherwise.
> For the series: Reviewed-by: Brian Paul <brianp at vmware.com>
>
>
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
More information about the Piglit
mailing list