This test ignores the actual border pixels, because we don't care.
Just make sure the body of the texture works.
---
tests/all.tests | 1 +
tests/texturing/CMakeLists.gl.txt | 1 +
tests/texturing/copyteximage-border.c | 109 +++++++++++++++++++++++++++++++++
3 files changed, 111 insertions(+), 0 deletions(-)
create mode 100644 tests/texturing/copyteximage-border.c
diff --git a/tests/all.tests b/tests/all.tests
index 760487a..c076808 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -613,6 +613,7 @@ add_concurrent_test(texturing, '1-1-linear-texture')
add_plain_test(texturing, 'array-texture')
add_plain_test(texturing, 'copytexsubimage')
add_plain_test(texturing, 'copyteximage')
+add_plain_test(texturing, 'copyteximage-border')
add_plain_test(texturing, 'copyteximage-clipping')
add_plain_test(texturing, 'cubemap')
texturing['cubemap npot'] = PlainExecTest(['cubemap', '-auto', 'npot'])
diff --git a/tests/texturing/CMakeLists.gl.txt
b/tests/texturing/CMakeLists.gl.txt
index a801dc5..ac9b91d 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -17,6 +17,7 @@ add_executable (1-1-linear-texture 1-1-linear-texture.c)
add_executable (array-texture array-texture.c)
add_executable (copytexsubimage copytexsubimage.c)
add_executable (copyteximage copyteximage.c)
+add_executable (copyteximage-border copyteximage-border.c)
add_executable (copyteximage-clipping copyteximage-clipping.c)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_executable (crossbar crossbar.c)
diff --git a/tests/texturing/copyteximage-border.c
b/tests/texturing/copyteximage-border.c
new file mode 100644
index 0000000..13132a4
--- /dev/null
+++ b/tests/texturing/copyteximage-border.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2011 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.
+ */
+
+/**
+ * Test that glCopyTexImage() into a texture with a texture border
+ * gets correct non-border texels.
+ */
+
+
+#include "piglit-util.h"
+
+/* Size of the body of the texture, not counting border. */
+#define TEX_SIZE 64
+
+int piglit_width = TEX_SIZE * 2 + 30;
+int piglit_height = TEX_SIZE + 20;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
+
+enum piglit_result
+piglit_display(void)
+{
+ bool pass = true;
+ int quad_w = TEX_SIZE / 2;
+ int quad_h = TEX_SIZE / 2;
+ float red[] = {1.0, 0.0, 0.0, 0.0};
+ float green[] = {0.0, 1.0, 0.0, 0.0};
+ float blue[] = {0.0, 0.0, 1.0, 0.0};
+ float white[] = {1.0, 1.0, 1.0, 0.0};
+ GLuint tex;
+ int x, y;
+
+ piglit_ortho_projection(piglit_width, piglit_height, false);
+
+ glClearColor(0.5, 0.5, 0.5, 0.5);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ x = 10;
+ y = 10;
+
+ glColor4fv(red);
+ piglit_draw_rect(x, y, quad_w, quad_h);
+ glColor4fv(green);
+ piglit_draw_rect(x + quad_w, y, quad_w, quad_h);
+ glColor4fv(blue);
+ piglit_draw_rect(x, y + quad_h, quad_w, quad_h);
+ glColor4fv(white);
+ piglit_draw_rect(x + quad_w, y + quad_h, quad_w, quad_h);
+
+ glGenTextures(1, &tex);
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ /* Copy the rectangle drawn to our texture, with a 1-pixel
+ * border around it.
+ */
+ glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+ x - 1, y - 1,
+ TEX_SIZE + 2, TEX_SIZE + 2,
+ 1);
+
+ x = 20 + TEX_SIZE;
+ y = 10;
+
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+ piglit_draw_rect_tex(x, y, TEX_SIZE, TEX_SIZE,
+ 0, 0, 1, 1);
+ glDisable(GL_TEXTURE_2D);
+ glDeleteTextures(1, &tex);
+
+ pass = piglit_probe_rect_rgba(x, y,
+ quad_w, quad_h, red) && pass;
+ pass = piglit_probe_rect_rgba(x + quad_w, y,
+ quad_w, quad_h, green) && pass;
+ pass = piglit_probe_rect_rgba(x, y + quad_h,
+ quad_w, quad_h, blue) && pass;
+ pass = piglit_probe_rect_rgba(x + quad_w, y + quad_h,
+ quad_w, quad_h, white) && pass;
+
+ piglit_present_results();
+
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+}
--
1.7.7
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
