[Piglit] [PATCH 2/7] EXT_framebuffer_multisample/renderbufferstorage-samples: New test.

Eric Anholt eric at anholt.net
Wed Jan 11 14:32:25 PST 2012


Makes sure that the old storage function doesn't allocate
multisamples.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/all.tests                                    |    1 +
 .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 +
 .../renderbufferstorage-samples.c                  |   76 ++++++++++++++++++++
 3 files changed, 78 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c

diff --git a/tests/all.tests b/tests/all.tests
index 08b6b30..296791c 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1215,6 +1215,7 @@ ext_framebuffer_multisample = Group()
 spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
 ext_framebuffer_multisample['dlist'] = concurrent_test('ext_framebuffer_multisample-dlist')
 ext_framebuffer_multisample['negative-max-samples'] = concurrent_test('ext_framebuffer_multisample-negative-max-samples')
+ext_framebuffer_multisample['renderbufferstorage-samples'] = concurrent_test('ext_framebuffer_multisample-renderbufferstorage-samples')
 ext_framebuffer_multisample['renderbuffer-samples'] = concurrent_test('ext_framebuffer_multisample-renderbuffer-samples')
 
 ext_framebuffer_object = Group()
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index ef61672..040acc7 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -14,3 +14,4 @@ link_libraries (
 add_executable (ext_framebuffer_multisample-dlist dlist.c)
 add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
 add_executable (ext_framebuffer_multisample-renderbuffer-samples renderbuffer-samples.c)
+add_executable (ext_framebuffer_multisample-renderbufferstorage-samples renderbufferstorage-samples.c)
diff --git a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c
new file mode 100644
index 0000000..2f4049d
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+#include "piglit-util.h"
+
+/**
+ * @file renderbufferstorage-samples.c
+ *
+ * From the EXT_framebuffer_multisample spec:
+ *
+ *     "The command
+ *
+ *         void RenderbufferStorageEXT(enum target, enum internalformat,
+ *                                     sizei width, sizei height);"
+ *
+ *      is equivalent to calling RenderbufferStorageMultisampleEXT
+ *      with <samples> equal to zero."
+ */
+
+int piglit_width = 32;
+int piglit_height = 32;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
+
+enum piglit_result
+piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLint rb_samples;
+	GLuint rb;
+	bool pass = true;
+
+	piglit_require_extension("GL_EXT_framebuffer_multisample");
+
+	glGenRenderbuffersEXT(1, &rb);
+	glBindRenderbufferEXT(GL_RENDERBUFFER, rb);
+	glRenderbufferStorageEXT(GL_RENDERBUFFER, GL_RGBA, 1, 1);
+	glGetRenderbufferParameterivEXT(GL_RENDERBUFFER,
+					GL_RENDERBUFFER_SAMPLES,
+					&rb_samples);
+
+	if (rb_samples != 0) {
+		fprintf(stderr, "glRenderbufferStorageEXT() produced %d samples\n",
+			rb_samples);
+		pass = false;
+	}
+
+	glDeleteRenderbuffersEXT(1, &rb);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.7.3



More information about the Piglit mailing list