[Piglit] [PATCH 2/2] add GL_EXT_window_rectangles tests

Ilia Mirkin imirkin at alum.mit.edu
Sun Jun 12 06:34:06 UTC 2016


Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 tests/spec/CMakeLists.txt                          |   1 +
 tests/spec/ext_window_rectangles/CMakeLists.gl.txt |  15 ++
 .../ext_window_rectangles/CMakeLists.gles2.txt     |   4 +
 tests/spec/ext_window_rectangles/CMakeLists.txt    |   1 +
 tests/spec/ext_window_rectangles/dlist.c           | 170 +++++++++++++++++++++
 tests/spec/ext_window_rectangles/errors.c          |  83 ++++++++++
 tests/spec/ext_window_rectangles/render.c          | 144 +++++++++++++++++
 7 files changed, 418 insertions(+)
 create mode 100644 tests/spec/ext_window_rectangles/CMakeLists.gl.txt
 create mode 100644 tests/spec/ext_window_rectangles/CMakeLists.gles2.txt
 create mode 100644 tests/spec/ext_window_rectangles/CMakeLists.txt
 create mode 100644 tests/spec/ext_window_rectangles/dlist.c
 create mode 100644 tests/spec/ext_window_rectangles/errors.c
 create mode 100644 tests/spec/ext_window_rectangles/render.c

diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 5583637..da9241d 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -147,3 +147,4 @@ add_subdirectory (oes_draw_elements_base_vertex)
 add_subdirectory (arb_shader_draw_parameters)
 add_subdirectory (arb_indirect_parameters)
 add_subdirectory (arb_query_buffer_object)
+add_subdirectory (ext_window_rectangles)
diff --git a/tests/spec/ext_window_rectangles/CMakeLists.gl.txt b/tests/spec/ext_window_rectangles/CMakeLists.gl.txt
new file mode 100644
index 0000000..13f8ea0
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/CMakeLists.gl.txt
@@ -0,0 +1,15 @@
+include_directories(
+	${GLEXT_INCLUDE_DIR}
+	${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+	piglitutil_${piglit_target_api}
+	${OPENGL_gl_LIBRARY}
+)
+
+piglit_add_executable (ext_window_rectangles-dlist dlist.c)
+piglit_add_executable (ext_window_rectangles-errors errors.c)
+piglit_add_executable (ext_window_rectangles-render render.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/ext_window_rectangles/CMakeLists.gles2.txt b/tests/spec/ext_window_rectangles/CMakeLists.gles2.txt
new file mode 100644
index 0000000..d5d0a08
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/CMakeLists.gles2.txt
@@ -0,0 +1,4 @@
+link_libraries(piglitutil_${piglit_target_api})
+
+piglit_add_executable (ext_window_rectangles-errors_gles3 errors.c)
+piglit_add_executable (ext_window_rectangles-render_gles3 render.c)
diff --git a/tests/spec/ext_window_rectangles/CMakeLists.txt b/tests/spec/ext_window_rectangles/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/ext_window_rectangles/dlist.c b/tests/spec/ext_window_rectangles/dlist.c
new file mode 100644
index 0000000..5983654
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/dlist.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2016 Ilia Mirkin
+ *
+ * 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.
+ */
+
+/**
+ * \file dlist.c
+ *
+ * Test that glWindowRectanglesEXT works inside of a call list. See
+ * draw.c for testing technique comments.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 30;
+	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+GLint prog, color;
+GLuint fb;
+
+enum piglit_result
+piglit_display(void)
+{
+	static const float blue[4] = {0, 0, 1, 1};
+	static const float green[4] = {0, 1, 0, 1};
+	static const float red[4] = {1, 0, 0, 1};
+	static const int rect[4] = {10, 10, 10, 10};
+
+	GLuint list;
+	bool passa = true, passb = true;
+
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glUseProgram(prog);
+
+	glViewport(0, 0, 20, 20);
+
+	glClearColor(0, 0, 1, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	list = glGenLists(2);
+
+	/* Try a single rect in exclusive mode */
+	glNewList(list, GL_COMPILE_AND_EXECUTE);
+	glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, 1, rect);
+	glUniform4fv(color, 1, green);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glEndList();
+
+	if (!piglit_probe_rect_rgba(0, 0, 10, 10, green)) {
+		printf("  FAIL: green color not filled in \n");
+		passa = false;
+	}
+	if (!piglit_probe_rect_rgba(10, 10, 10, 10, blue)) {
+		printf("  FAIL: green color fills in excluded area\n");
+		passa = false;
+	}
+
+	/* And now in inclusive mode */
+	glNewList(list + 1, GL_COMPILE_AND_EXECUTE);
+	glWindowRectanglesEXT(GL_INCLUSIVE_EXT, 1, rect);
+	glUniform4fv(color, 1, red);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glEndList();
+
+	if (!piglit_probe_rect_rgba(0, 0, 10, 10, green)) {
+		printf("  FAIL: green color overwritten\n");
+		passa = false;
+	}
+	if (!piglit_probe_rect_rgba(10, 10, 10, 10, red)) {
+		printf("  FAIL: red color not written to included area\n");
+		passa = false;
+	}
+
+	piglit_report_subtest_result(passa ? PIGLIT_PASS : PIGLIT_FAIL,
+				     "compile and execute");
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glCallList(list);
+	if (!piglit_probe_rect_rgba(0, 0, 10, 10, green)) {
+		printf("  FAIL: green color not filled in \n");
+		passb = false;
+	}
+	if (!piglit_probe_rect_rgba(10, 10, 10, 10, blue)) {
+		printf("  FAIL: green color fills in excluded area\n");
+		passb = false;
+	}
+
+	glCallList(list + 1);
+	if (!piglit_probe_rect_rgba(0, 0, 10, 10, green)) {
+		printf("  FAIL: green color overwritten\n");
+		passa = false;
+	}
+	if (!piglit_probe_rect_rgba(10, 10, 10, 10, red)) {
+		printf("  FAIL: red color not written to included area\n");
+		passa = false;
+	}
+
+	piglit_report_subtest_result(passb ? PIGLIT_PASS : PIGLIT_FAIL,
+				     "call");
+
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
+	glBlitFramebuffer(0, 0, 20, 20,
+			  0, 0, piglit_width, piglit_height,
+			  GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+	piglit_present_results();
+
+	return (passa && passb) ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	static const float verts[4][4] = {
+		/* x   y   z   w */
+		{ -1, -1, 1.0, 1 },
+		{  1, -1, 1.0, 1 },
+		{ -1,  1, 0.1, 1 },
+		{  1,  1, 0.1, 1 }
+	};
+
+	GLuint bo, rb;
+
+	piglit_require_extension("GL_EXT_window_rectangles");
+
+	prog = piglit_build_simple_program(
+			"#version 120\n"
+			"void main() { gl_Position = gl_Vertex; }\n",
+
+			"#version 120\n"
+			"uniform vec4 color;\n"
+			"void main() { gl_FragColor = color; }\n");
+	color = glGetUniformLocation(prog, "color");
+
+	glEnableVertexAttribArray(0);
+	glGenBuffers(1, &bo);
+	glBindBuffer(GL_ARRAY_BUFFER, bo);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts, GL_STATIC_DRAW);
+	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, (GLvoid const *)0);
+
+	glGenFramebuffers(1, &fb);
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glGenRenderbuffers(1, &rb);
+	glBindRenderbuffer(GL_RENDERBUFFER, rb);
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB, 20, 20);
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+				  GL_RENDERBUFFER, rb);
+}
diff --git a/tests/spec/ext_window_rectangles/errors.c b/tests/spec/ext_window_rectangles/errors.c
new file mode 100644
index 0000000..dbbdcc0
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/errors.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 Ilia Mirkin
+ *
+ * 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.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 30;
+	config.supports_gl_es_version = 30;
+	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	bool pass = true;
+	GLint box[9 * 4] = {0};
+	int max;
+	piglit_require_extension("GL_EXT_window_rectangles");
+
+	glGetIntegerv(GL_MAX_WINDOW_RECTANGLES_EXT, &max);
+
+	glWindowRectanglesEXT(0, 0, NULL);
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, -1, NULL);
+	if (!piglit_check_gl_error(GL_INVALID_VALUE))
+		pass = false;
+
+	if (max < 9) {
+		GLint t[4];
+		glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, max + 1, box);
+		if (!piglit_check_gl_error(GL_INVALID_VALUE))
+			pass = false;
+
+		glGetIntegeri_v(GL_WINDOW_RECTANGLE_EXT, max + 1, t);
+		if (!piglit_check_gl_error(GL_INVALID_VALUE))
+			pass = false;
+	}
+
+	if (max > 9)
+		max = 9;
+
+	box[2] = -1;
+	glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, max, box);
+	if (!piglit_check_gl_error(GL_INVALID_VALUE))
+		pass = false;
+	box[2] = 0;
+	box[3] = -1;
+	glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, max, box);
+	if (!piglit_check_gl_error(GL_INVALID_VALUE))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
diff --git a/tests/spec/ext_window_rectangles/render.c b/tests/spec/ext_window_rectangles/render.c
new file mode 100644
index 0000000..00a4662
--- /dev/null
+++ b/tests/spec/ext_window_rectangles/render.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2016 Ilia Mirkin
+ *
+ * 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.
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 30;
+	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+GLint prog, color;
+GLuint fb;
+
+enum piglit_result
+piglit_display(void)
+{
+	static const float blue[4] = {0, 0, 1, 1};
+	static const float green[4] = {0, 1, 0, 1};
+	static const int rect[4 * 8] = {
+	  0, 0, 1, 1,
+	  2, 0, 1, 1,
+	  4, 0, 1, 1,
+	  1, 1, 1, 1,
+	  3, 1, 1, 1,
+	  5, 1, 1, 1,
+	  0, 2, 1, 1,
+	  2, 2, 1, 1,
+	};
+
+	bool pass = true;
+
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glUseProgram(prog);
+
+	glViewport(0, 0, 20, 20);
+
+	glClearColor(0, 0, 1, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glWindowRectanglesEXT(GL_EXCLUSIVE_EXT, 8, rect);
+	glUniform4fv(color, 1, green);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	for (int i = 0; i < 20; i++) {
+		for (int j = 0; j < 20; j++) {
+			// excluded
+			if ((i == 0 && (j == 0 || j == 2 || j == 4)) ||
+			    (i == 1 && (j == 1 || j == 3 || j == 5)) ||
+			    (i == 2 && (j == 0 || j == 2)))
+				pass &= piglit_probe_pixel_rgb(j, i, blue);
+			else
+				pass &= piglit_probe_pixel_rgb(j, i, green);
+		}
+	}
+
+	glClearColor(0, 0, 1, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glWindowRectanglesEXT(GL_INCLUSIVE_EXT, 8, rect);
+	glUniform4fv(color, 1, green);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+	for (int i = 0; i < 20; i++) {
+		for (int j = 0; j < 20; j++) {
+			// included
+			if ((i == 0 && (j == 0 || j == 2 || j == 4)) ||
+			    (i == 1 && (j == 1 || j == 3 || j == 5)) ||
+			    (i == 2 && (j == 0 || j == 2)))
+				pass &= piglit_probe_pixel_rgb(j, i, green);
+			else
+				pass &= piglit_probe_pixel_rgb(j, i, blue);
+		}
+	}
+
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
+	glBlitFramebuffer(0, 0, 20, 20,
+			  0, 0, piglit_width, piglit_height,
+			  GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+	piglit_present_results();
+
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	static const float verts[4][4] = {
+		/* x   y   z   w */
+		{ -1, -1, 1.0, 1 },
+		{  1, -1, 1.0, 1 },
+		{ -1,  1, 0.1, 1 },
+		{  1,  1, 0.1, 1 }
+	};
+
+	GLuint bo, rb;
+
+	piglit_require_extension("GL_EXT_window_rectangles");
+
+	prog = piglit_build_simple_program(
+			"#version 120\n"
+			"void main() { gl_Position = gl_Vertex; }\n",
+
+			"#version 120\n"
+			"uniform vec4 color;\n"
+			"void main() { gl_FragColor = color; }\n");
+	color = glGetUniformLocation(prog, "color");
+
+	glEnableVertexAttribArray(0);
+	glGenBuffers(1, &bo);
+	glBindBuffer(GL_ARRAY_BUFFER, bo);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(verts), verts, GL_STATIC_DRAW);
+	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 0, (GLvoid const *)0);
+
+	glGenFramebuffers(1, &fb);
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glGenRenderbuffers(1, &rb);
+	glBindRenderbuffer(GL_RENDERBUFFER, rb);
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB, 20, 20);
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+				  GL_RENDERBUFFER, rb);
+}
-- 
2.7.3



More information about the Piglit mailing list