On 09/05/2012 04:29 PM, Anuj Phogat wrote:
On Tue, Sep 4, 2012 at 4:05 PM, Brian Paul<bri...@vmware.com>  wrote:
---
  tests/all.tests                          |    1 +
  tests/texturing/CMakeLists.gl.txt        |    1 +
  tests/texturing/max-texture-size-level.c |   87 ++++++++++++++++++++++++++++++
  3 files changed, 89 insertions(+), 0 deletions(-)
  create mode 100644 tests/texturing/max-texture-size-level.c

diff --git a/tests/all.tests b/tests/all.tests
index 5b1c1cc..154e1e5 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -734,6 +734,7 @@ add_plain_test(texturing, 'lodclamp-between')
  add_plain_test(texturing, 'lodclamp-between-max')
  add_plain_test(texturing, 'mipmap-setup')
  add_plain_test(texturing, 'max-texture-size')
+add_concurrent_test(texturing, 'max-texture-size-level')
  add_concurrent_test(texturing, 'proxy-texture')
  add_plain_test(texturing, 'rg-draw-pixels')
  add_plain_test(texturing, 'rg-teximage-01')
diff --git a/tests/texturing/CMakeLists.gl.txt 
b/tests/texturing/CMakeLists.gl.txt
index 4fa0f7f..c439273 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -45,6 +45,7 @@ piglit_add_executable (lodclamp lodclamp.c)
  piglit_add_executable (lodclamp-between lodclamp-between.c)
  piglit_add_executable (lodclamp-between-max lodclamp-between-max.c)
  piglit_add_executable (max-texture-size max-texture-size.c)
+piglit_add_executable (max-texture-size-level max-texture-size-level.c)
  piglit_add_executable (mipmap-setup mipmap-setup.c)
  piglit_add_executable (proxy-texture proxy-texture.c)
  piglit_add_executable (rg-draw-pixels rg-draw-pixels.c)
diff --git a/tests/texturing/max-texture-size-level.c 
b/tests/texturing/max-texture-size-level.c
new file mode 100644
index 0000000..390e862
--- /dev/null
+++ b/tests/texturing/max-texture-size-level.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2012 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
+ * 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.
+ */
+
+/**
+ * Test glTexImage with an image too large for the given mipmap level.
+ *
+ * Page 157 of the OpenGL 2.1 spec says:
+ *
+ * "In a similar fashion, the maximum allowable width of a one- or
+ * two- dimensional texture image, and the maximum allowable height of a
+ * two- dimensional texture image, must be at least 2k-lod + 2bt for
+ * image arrays of level 0 through k, where k is the log base 2 of MAX
+ * TEXTURE SIZE. The maximum allowable width and height of a cube map
+ * texture must be the same, and must be at least 2k-lod + 2bt for image
+ * arrays level 0 through k, where k is the log base 2 of MAX CUBE MAP
+ * TEXTURE SIZE."
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_MAIN(100, 100, GLUT_RGBA | GLUT_DOUBLE)
+
+enum piglit_result
+piglit_display(void)
+{
+       /* no op */
+       return PIGLIT_PASS;
+}
+
+
+void
+piglit_init(int argc, char **argv)
+{
+       GLint maxSize;
+       GLuint tex;
+       bool pass;
+
+       glGetIntegerv(GL_MAX_TEXTURE_SIZE,&maxSize);
+       printf("GL_MAX_TEXTURE_SIZE = %d\n", maxSize);
+
+       glGenTextures(1,&tex);
+       glBindTexture(GL_TEXTURE_2D, tex);
+
+       /* The max texture size should be OK for mipmap level zero. */
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+                    maxSize, maxSize, 0,
+                    GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       pass = piglit_check_gl_error(GL_NO_ERROR);
+
+       /* Setting the level 1 image to the max texture size should be
+        * an error.
+        */
+       glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA,
+                    maxSize, maxSize, 0,
+                    GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       pass = piglit_check_gl_error(GL_INVALID_VALUE)&  pass;
+
+       /* Setting the level 2 image to half the max texture size should be
+        * an error also.
+        */
+       glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA,
+                    maxSize/2, maxSize/2, 0,
+                    GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       pass = piglit_check_gl_error(GL_INVALID_VALUE)&  pass;

You might also consider testing level 1, 2 with (maxSize/2, maxSize/2)
and (maxSize/4, maxSize/4) respectively. As per spec GL_NO_ERROR
is expected in both cases. This will verify that driver actually follows the
spec while computing max allowed texture size at different mip levels.

Well, if a driver gets that wrong almost any app or test that creates a mipmap will fail. Quite a few other piglit tests would hit that.

But feel free to add that to the test if you want.

-Brian
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to