[Piglit] [PATCH 2/3] GL 3.2: Test gl_Layer with non layered texture.

Jacob Penner jkpenner91 at gmail.com
Tue Sep 17 14:35:44 PDT 2013


---
 tests/all.tests                                    |   1 +
 .../gl-3.2/layered-rendering/CMakeLists.gl.txt     |   1 +
 .../layered-rendering/gl-layer-not-layered.c       | 149 +++++++++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c

diff --git a/tests/all.tests b/tests/all.tests
index 88b7ce3..dc0ead3 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -755,6 +755,7 @@ spec['!OpenGL 3.2/layered-rendering/clear-depth'] = concurrent_test('gl-3.2-laye
 spec['!OpenGL 3.2/layered-rendering/framebuffertexture-buffer-textures'] = concurrent_test('gl-3.2-layered-rendering-framebuffertexture-buffer-textures')
 spec['!OpenGL 3.2/layered-rendering/readpixels'] = concurrent_test('gl-3.2-layered-rendering-readpixels')
 spec['!OpenGL 3.2/layered-rendering/gl-layer'] = concurrent_test('gl-3.2-layered-rendering-gl-layer')
+spec['!OpenGL 3.2/layered-rendering/gl-layer-not-layered'] = concurrent_test('gl-3.2-layered-rendering-gl-layer-not-layered')
 
 spec['!OpenGL 3.3/minmax'] = concurrent_test('gl-3.3-minmax')
 spec['!OpenGL 3.3/required-renderbuffer-attachment-formats'] = concurrent_test('gl-3.0-required-renderbuffer-attachment-formats 33')
diff --git a/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
index bc4415d..98809ad 100644
--- a/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
@@ -15,4 +15,5 @@ piglit_add_executable (gl-3.2-layered-rendering-clear-depth clear-depth.c)
 piglit_add_executable (gl-3.2-layered-rendering-framebuffertexture-buffer-textures framebuffertexture-buffer-textures.c)
 piglit_add_executable (gl-3.2-layered-rendering-readpixels readpixels.c)
 piglit_add_executable (gl-3.2-layered-rendering-gl-layer gl-layer.c)
+piglit_add_executable (gl-3.2-layered-rendering-gl-layer-not-layered gl-layer-not-layered.c)
 # vim: ft=cmake:
diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c
new file mode 100644
index 0000000..c3d342e
--- /dev/null
+++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+
+/** @file framebuffer-multi-attachments.c
+ *
+ * Section 4.4.7(Framebuffer Objects) From GL spec 3.2 core:
+ *
+ * A layer number written by a geometry shader has no effect if
+ * the framebuffer is not layered.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 32;
+	config.supports_gl_core_version   = 32;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+const char *vs_source = {
+	"#version 150\n"
+	"in vec4 piglit_vertex;\n"
+	"out vec4 vert;\n"
+	"void main() {\n"
+	"	gl_Position = piglit_vertex;\n"
+	"	vert = piglit_vertex;\n"
+	"}\n"
+};
+
+const char *gs_source = {
+	"#version 150\n"
+	"layout(triangles) in;\n"
+	"layout(triangles, max_vertices = 3) out;\n"
+	"in vec4 vert[3];\n"
+	"uniform int layer;\n"
+	"\n"
+	"void main()\n"
+	"{\n"
+	"	for(int i = 0; i < 3; i++) {\n"
+	"		gl_Layer = layer;\n"
+	"		gl_Position = vert[i];\n"
+	"		EmitVertex();\n"
+	"	}\n"
+	"}\n"
+};
+
+const char *fs_source = {
+	"#version 150\n"
+	"void main() {\n"
+	"	gl_FragColor = vec4(0, 1, 0, 1);\n"
+	"}\n"
+};
+
+bool check_framebuffer_status(GLenum target, GLenum expected) {
+	GLenum observed = glCheckFramebufferStatus(target);
+	if(expected != observed) {
+		printf("Unexpected framebuffer status!\n"
+		       "  Observed: %s\n  Expected: %s\n",
+		       piglit_get_gl_enum_name(observed),
+		       piglit_get_gl_enum_name(expected));
+		return false;
+	}
+	return true;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLint program;
+	GLuint fbo, texture;
+	GLuint layer_uniform;
+	bool pass = true;
+
+	float expected[] = {
+		0.0, 1.0, 0.0,
+	};
+
+	program = piglit_build_simple_program_multiple_shaders(
+						GL_VERTEX_SHADER,   vs_source,
+						GL_GEOMETRY_SHADER, gs_source,
+						GL_FRAGMENT_SHADER, fs_source,
+						0);
+	glUseProgram(program);
+
+	layer_uniform = glGetUniformLocation(program, "layer");
+
+	glGenTextures(1, &texture);
+	glBindTexture(GL_TEXTURE_2D, texture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 10,
+		     10, 0, GL_RGB, GL_FLOAT, NULL);
+
+	glGenFramebuffers(1, &fbo);
+	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+			       GL_TEXTURE_2D, texture, 0);
+
+	/* Check for errors during setup */
+	if(!check_framebuffer_status(GL_FRAMEBUFFER, GL_FRAMEBUFFER_COMPLETE) ||
+	   !piglit_check_gl_error(GL_NO_ERROR)) {
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	/* Try to draw quad to layer 2 */
+	glUniform1i(layer_uniform, 2);
+	piglit_draw_rect(-1, -1, 2, 2);
+
+	pass = piglit_probe_rect_rgb(0, 0, 10, 10, expected) && pass;
+
+	/* Clean up */
+	glDeleteTextures(1, &texture);
+	glDeleteFramebuffers(1, &fbo);
+
+	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* UNREACHABLE */
+	return PIGLIT_FAIL;
+}
-- 
1.8.3.1



More information about the Piglit mailing list