[Piglit] [PATCH 2/2] texture-storage: test GL_ARB_texture_storage
Ian Romanick
idr at freedesktop.org
Thu Oct 27 10:47:09 PDT 2011
On 10/26/2011 06:33 PM, Brian Paul wrote:
> Note, this test depends on glew 1.7.0. Otherwise it's skipped.
Since piglit includes its own copy of glew, we should update piglit's
copy and skip the test.
> ---
> tests/all.tests | 4 +
> tests/spec/CMakeLists.txt | 1 +
> tests/spec/arb_texture_storage/CMakeLists.gl.txt | 17 +
> tests/spec/arb_texture_storage/CMakeLists.txt | 1 +
> tests/spec/arb_texture_storage/texture-storage.c | 372 ++++++++++++++++++++++
> 5 files changed, 395 insertions(+), 0 deletions(-)
> create mode 100644 tests/spec/arb_texture_storage/CMakeLists.gl.txt
> create mode 100644 tests/spec/arb_texture_storage/CMakeLists.txt
> create mode 100644 tests/spec/arb_texture_storage/texture-storage.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 9f9fadf..00c2c93 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -986,6 +986,10 @@ add_shader_test_dir(arb_texture_rectangle,
> os.path.dirname(__file__) + '/spec/arb_texture_rectangle',
> recursive=True)
>
> +arb_texture_storage = Group()
> +spec['ARB_texture_storage'] = arb_texture_storage
> +add_plain_test(arb_texture_storage, 'texture-storage')
> +
> tdfx_texture_compression_fxt1 = Group()
> spec['3DFX_texture_compression_FXT1'] = tdfx_texture_compression_fxt1
> add_fbo_generatemipmap_extension(tdfx_texture_compression_fxt1, 'GL_3DFX_texture_compression_FXT1', 'fbo-generatemipmap-formats')
> diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
> index 13417c4..46f5ee7 100644
> --- a/tests/spec/CMakeLists.txt
> +++ b/tests/spec/CMakeLists.txt
> @@ -11,6 +11,7 @@ add_subdirectory (arb_shader_objects)
> add_subdirectory (ati_draw_buffers)
> add_subdirectory (arb_texture_compression)
> add_subdirectory (arb_texture_float)
> +add_subdirectory (arb_texture_storage)
> add_subdirectory (arb_transform_feedback2)
> add_subdirectory (ati_envmap_bumpmap)
> add_subdirectory (ext_fog_coord)
> diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
> new file mode 100644
> index 0000000..d2fb999
> --- /dev/null
> +++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
> @@ -0,0 +1,17 @@
> +include_directories(
> + ${GLEXT_INCLUDE_DIR}
> + ${OPENGL_INCLUDE_PATH}
> + ${GLUT_INCLUDE_DIR}
> + ${piglit_SOURCE_DIR}/tests/util
> +)
> +
> +link_libraries (
> + piglitutil
> + ${OPENGL_gl_LIBRARY}
> + ${OPENGL_glu_LIBRARY}
> + ${GLUT_glut_LIBRARY}
> +)
> +
> +add_executable (arb_texture_storage-texture-storage texture-storage.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/spec/arb_texture_storage/CMakeLists.txt b/tests/spec/arb_texture_storage/CMakeLists.txt
> new file mode 100644
> index 0000000..144a306
> --- /dev/null
> +++ b/tests/spec/arb_texture_storage/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c
> new file mode 100644
> index 0000000..9848b0b
> --- /dev/null
> +++ b/tests/spec/arb_texture_storage/texture-storage.c
> @@ -0,0 +1,372 @@
> +/*
> + * Copyright (c) 2011 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.
> + */
> +
> +/**
> + * Tests GL_ARB_texture_storage
> + * Note: only the glTexStorage2D() function is tested with actual rendering.
> + * Brian Paul
> + */
> +
> +#include "piglit-util.h"
> +#include "piglit-glx-util.h"
> +
> +int piglit_width = 100, piglit_height = 100;
> +int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
> +static const char *TestName = "texture-storage";
> +
> +#ifdef GL_ARB_texture_storage
> +
> +
> +static GLubyte Colors[][4] = {
> + {255, 0, 0, 255},
> + { 0, 255, 0, 255},
> + { 0, 0, 255, 255},
> + { 0, 255, 255, 255},
> + {255, 0, 255, 255},
> + {255, 255, 0, 255},
> + {255, 255, 255, 255},
> + {128, 0, 0, 255},
> + { 0, 128, 0, 255},
> + { 0, 0, 128, 255}
> +};
> +
> +
> +/**
> + * Do error-check tests for a non-mipmapped texture.
> + */
> +static GLboolean
> +test_one_level_errors(GLenum target)
> +{
> + const GLint width = 64, height = 4, depth = 8;
> + const char *targetString = "";
> + GLuint tex;
> + GLint v;
> +
> + assert(target == GL_TEXTURE_1D ||
> + target == GL_TEXTURE_2D ||
> + target == GL_TEXTURE_3D);
> +
> + glGenTextures(1,&tex);
> + glBindTexture(target, tex);
> +
> + if (target == GL_TEXTURE_1D) {
> + glTexStorage1D(target, 1, GL_RGBA, width);
> + targetString = "GL_TEXTURE_1D";
> + }
> + else if (target == GL_TEXTURE_2D) {
> + glTexStorage2D(target, 1, GL_RGBA, width, height);
> + targetString = "GL_TEXTURE_2D";
> + }
> + else if (target == GL_TEXTURE_3D) {
> + glTexStorage3D(target, 1, GL_RGBA, width, height, depth);
> + targetString = "GL_TEXTURE_3D";
> + }
> +
> + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_WIDTH,&v);
> + if (v != width) {
> + printf("%s: bad width: %d, should be %d\n", TestName, v, width);
> + return GL_FALSE;
> + }
> +
> + if (target != GL_TEXTURE_1D) {
> + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_HEIGHT,&v);
> + if (v != height) {
> + printf("%s: bad height: %d, should be %d\n", TestName, v, height);
> + return GL_FALSE;
> + }
> + }
> +
> + if (target == GL_TEXTURE_3D) {
> + glGetTexLevelParameteriv(target, 0, GL_TEXTURE_DEPTH,&v);
> + if (v != depth) {
> + printf("%s: bad depth: %d, should be %d\n", TestName, v, depth);
> + return GL_FALSE;
> + }
> + }
> +
> + /*
> + * Test immutability.
> + */
> + if (target == GL_TEXTURE_2D) {
> + glTexImage2D(target, 0, GL_RGBA, width, height, 0,
> + GL_RGBA, GL_UNSIGNED_BYTE, NULL);
> + if (glGetError() != GL_INVALID_OPERATION) {
> + printf("%s: glTexImage2D failed to generate error\n", TestName);
> + return GL_FALSE;
> + }
> +
> + glTexStorage2D(target, 1, GL_RGBA, width, height);
> + if (glGetError() != GL_INVALID_OPERATION) {
> + printf("%s: glTexStorage2D() failed to generate error\n", TestName);
> + return GL_FALSE;
> + }
> +
> + glCopyTexImage2D(target, 0, GL_RGBA, 0, 0, width, height, 0);
> + if (glGetError() != GL_INVALID_OPERATION) {
> + printf("%s: glCopyTexImage2D() failed to generate error\n", TestName);
> + return GL_FALSE;
> + }
> + }
> +
> + glDeleteTextures(1,&tex);
> +
> + return GL_TRUE;
> +}
> +
> +
> +/**
> + * Do error-check tests for a mipmapped texture.
> + */
> +static GLboolean
> +test_mipmap_errors(GLenum target)
> +{
> + GLint width = 128, height = 64, depth = 4, levels = 8;
> + const char *targetString = "";
> + GLuint tex;
> + GLint v, l;
> +
> + assert(target == GL_TEXTURE_1D ||
> + target == GL_TEXTURE_2D ||
> + target == GL_TEXTURE_3D);
> +
> + glGenTextures(1,&tex);
> + glBindTexture(target, tex);
> +
> + if (target == GL_TEXTURE_1D) {
> + glTexStorage1D(target, levels, GL_RGBA, width);
> + targetString = "GL_TEXTURE_1D";
> + }
> + else if (target == GL_TEXTURE_2D) {
> + glTexStorage2D(target, levels, GL_RGBA, width, height);
> + targetString = "GL_TEXTURE_2D";
> + }
> + else if (target == GL_TEXTURE_3D) {
> + glTexStorage3D(target, levels, GL_RGBA, width, height, depth);
> + targetString = "GL_TEXTURE_3D";
> + }
> +
> + glGetTexParameteriv(target, GL_TEXTURE_IMMUTABLE_FORMAT,&v);
> + if (!v) {
> + printf("%s: %s GL_TEXTURE_IMMUTABLE_FORMAT query returned false\n", TestName, targetString);
> + return GL_FALSE;
> + }
> +
> + for (l = 0; l< levels; l++) {
> + glGetTexLevelParameteriv(target, l, GL_TEXTURE_WIDTH,&v);
> + if (v != width) {
> + printf("%s: %s level %d: bad width: %d, should be %d\n",
> + TestName, targetString, l, v, width);
> + return GL_FALSE;
> + }
> +
> + if (target != GL_TEXTURE_1D) {
> + glGetTexLevelParameteriv(target, l, GL_TEXTURE_HEIGHT,&v);
> + if (v != height) {
> + printf("%s: %s level %d: bad height: %d, should be %d\n",
> + TestName, targetString, l, v, height);
> + return GL_FALSE;
> + }
> + }
> +
> + if (target == GL_TEXTURE_3D) {
> + glGetTexLevelParameteriv(target, l, GL_TEXTURE_DEPTH,&v);
> + if (v != depth) {
> + printf("%s: %s level %d: bad depth: %d, should be %d\n",
> + TestName, targetString, l, v, depth);
> + return GL_FALSE;
> + }
> + }
> +
> + if (width> 1)
> + width /= 2;
> + if (height> 1)
> + height /= 2;
> + if (depth> 1)
> + depth /= 2;
> + }
> +
> + glDeleteTextures(1,&tex);
> +
> + return GL_TRUE;
> +}
> +
> +
> +/**
> + * Create a single-color image.
> + */
> +static GLubyte *
> +create_image(GLint w, GLint h, const GLubyte color[4])
> +{
> + GLubyte *buf = (GLubyte *) malloc(w * h * 4);
> + int i;
> + for (i = 0; i< w * h; i++) {
> + buf[i*4+0] = color[0];
> + buf[i*4+1] = color[1];
> + buf[i*4+2] = color[2];
> + buf[i*4+3] = color[3];
> + }
> + return buf;
> +}
> +
> +
> +/**
> + * Test a mip-mapped texture w/ rendering.
> + */
> +static GLboolean
> +test_2d_mipmap_rendering(void)
> +{
> + GLuint tex;
> + GLint width = 128, height = 64, levels = 8;
> + GLint v, l;
> +
> + glGenTextures(1,&tex);
> + glBindTexture(GL_TEXTURE_2D, tex);
> +
> + glTexStorage2D(GL_TEXTURE_2D, levels, GL_RGBA, width, height);
> +
> + /* check that the mipmap level sizes are correct */
> + for (l = 0; l< levels; l++) {
> + GLubyte *buf = create_image(width, height, Colors[l]);
> +
> + glTexSubImage2D(GL_TEXTURE_2D, l, 0, 0, width, height,
> + GL_RGBA, GL_UNSIGNED_BYTE, buf);
> +
> + free(buf);
> +
> + glGetTexLevelParameteriv(GL_TEXTURE_2D, l, GL_TEXTURE_WIDTH,&v);
> + if (v != width) {
> + printf("%s: level %d: bad width: %d, should be %d\n",
> + TestName, l, v, width);
> + return GL_FALSE;
> + }
> +
> + glGetTexLevelParameteriv(GL_TEXTURE_2D, l, GL_TEXTURE_HEIGHT,&v);
> + if (v != height) {
> + printf("%s: level %d: bad height: %d, should be %d\n",
> + TestName, l, v, height);
> + return GL_FALSE;
> + }
> +
> + if (width> 1)
> + width /= 2;
> + if (height> 1)
> + height /= 2;
> + }
> +
> + /* This should generate and error (bad level) */
> + {
> + GLubyte *buf = create_image(width, height, Colors[l]);
> + GLenum err;
> +
> + glTexSubImage2D(GL_TEXTURE_2D, levels, 0, 0, width, height,
> + GL_RGBA, GL_UNSIGNED_BYTE, buf);
> +
> + err = glGetError();
> + if (err == GL_NO_ERROR) {
> + printf("%s: glTexSubImage2D(illegal level) failed to generate an error.\n",
> + TestName);
> + return GL_FALSE;
> + }
> +
> + free(buf);
> + }
> +
> + /* now do a rendering test */
> + glEnable(GL_TEXTURE_2D);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> +
> + /* draw a quad using each texture mipmap level */
> + for (l = 0; l< levels; l++) {
> + GLfloat expected[4];
> + GLint p;
> +
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, l);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, l);
> +
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + piglit_draw_rect_tex(-1.0, -1.0, 2.0, 2.0,
> + 0.0, 0.0, 1.0, 1.0);
> +
> + expected[0] = Colors[l][0] / 255.0;
> + expected[1] = Colors[l][1] / 255.0;
> + expected[2] = Colors[l][2] / 255.0;
> + expected[3] = Colors[l][3] / 255.0;
> +
> + p = piglit_probe_pixel_rgb(piglit_width/2, piglit_height/2,
> + expected);
> +
> + glutSwapBuffers();
> +
> + if (!p) {
> + printf("%s: wrong color for mipmap level %d\n",
> + TestName, l);
> + return GL_FALSE;
> + }
> + }
> +
> + glDisable(GL_TEXTURE_2D);
> +
> + glDeleteTextures(1,&tex);
> +
> + return GL_TRUE;
> +}
> +
> +#endif /* GL_ARB_texture_storage */
> +
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + GLboolean pass = GL_TRUE;
> +
> +#ifdef GL_ARB_texture_storage
> + pass = pass&& test_one_level_errors(GL_TEXTURE_1D);
> + pass = pass&& test_one_level_errors(GL_TEXTURE_2D);
> + pass = pass&& test_one_level_errors(GL_TEXTURE_3D);
> + pass = pass&& test_mipmap_errors(GL_TEXTURE_1D);
> + pass = pass&& test_mipmap_errors(GL_TEXTURE_2D);
> + pass = pass&& test_mipmap_errors(GL_TEXTURE_3D);
> + pass = pass&& test_2d_mipmap_rendering();
We usually do this as
pass = do_some_test() && pass;
That way tests keep running even if an earlier test fails. If that
means too much data is emitted by the test, then that probably means the
test should get split up. :)
On that topic, I'm generally not a big fan of "everything" tests.
Mixing poking at the API and rendering in one test is generally a bad
idea. It can make tracking down the source of a failure more difficult.
That said, it's probably not too tragic in this case.
> +#endif /* GL_ARB_texture_storage */
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +#ifdef GL_ARB_texture_storage
> + if (GLEW_ARB_texture_storage) {
> + piglit_require_extension("GL_ARB_texture_storage");
> + }
> + else {
> + piglit_report_result(PIGLIT_SKIP);
> + }
> +#else
> + piglit_report_result(PIGLIT_SKIP);
> +#endif
> +}
More information about the Piglit
mailing list