[Piglit] [PATCH 2/5] EXT_framebuffer_multisample/renderbuffer-samples: New test

[Eric Anholt]

This tests that GL_RENDERBUFFER_SAMPLES returns a correct number of
samples.  It doesn't currently (requesting 1 produces 0).
---
 tests/all.tests                                    |    1 +
 .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 +
 .../renderbuffer-samples.c                         |   97 ++++++++++++++++++++
 3 files changed, 99 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c

diff --git a/tests/all.tests b/tests/all.tests
index eb333ce..7b05f57 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1208,6 +1208,7 @@ arb_vertex_program['minmax'] = concurrent_test('arb_vertex_program-minmax')
 ext_framebuffer_multisample = Group()
 spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
 ext_framebuffer_multisample['negative-max-samples'] = concurrent_test('ext_framebuffer_multisample-negative-max-samples')
+ext_framebuffer_multisample['renderbuffer-samples'] = concurrent_test('ext_framebuffer_multisample-renderbuffer-samples')
 
 ext_framebuffer_object = Group()
 spec['EXT_framebuffer_object'] = ext_framebuffer_object
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 3de9455..b542c1d 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -12,3 +12,4 @@ link_libraries (
 )
 
 add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
+add_executable (ext_framebuffer_multisample-renderbuffer-samples renderbuffer-samples.c)
diff --git a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c
new file mode 100644
index 0000000..72f523b
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c
@@ -0,0 +1,97 @@
+/*
+ * 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 renderbuffer-samples.c
+ *
+ * Tests that asking for samples gives the correct number of
+ * GL_RENDERBUFFER_SAMPLES.
+ *
+ * From the EXT_framebuffer_multisample spec:
+ *
+ *     "If <samples> is zero, then RENDERBUFFER_SAMPLES_EXT is set to
+ *      zero.  Otherwise <samples> represents a request for a desired
+ *      minimum number of samples. Since different implementations may
+ *      support different sample counts for multisampled rendering,
+ *      the actual number of samples allocated for the renderbuffer
+ *      image is implementation dependent.  However, the resulting
+ *      value for RENDERBUFFER_SAMPLES_EXT is guaranteed to be greater
+ *      than or equal to <samples> and no more than the next larger
+ *      sample count supported by the implementation.
+ */
+
+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 max_samples, samples, prev_rb_samples = 0;
+	GLuint rb;
+	bool pass = true;
+
+	piglit_require_extension("GL_EXT_framebuffer_multisample");
+
+	glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+	piglit_check_gl_error(0, PIGLIT_FAIL);
+
+	glGenRenderbuffersEXT(1, &rb);
+	glBindRenderbufferEXT(GL_RENDERBUFFER, rb);
+	printf("%10s %10s\n", "requested", "result");
+	for (samples = 0; samples <= max_samples; samples++) {
+		GLint rb_samples;
+
+		glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
+						    samples,
+						    GL_RGBA,
+						    1, 1);
+
+		glGetRenderbufferParameterivEXT(GL_RENDERBUFFER,
+						GL_RENDERBUFFER_SAMPLES,
+						&rb_samples);
+
+		if ((rb_samples < prev_rb_samples) ||
+		    (samples == 0 && rb_samples != 0) ||
+		    (samples > 0 && rb_samples < samples)) {
+			fprintf(stderr, "%10d %10d (ERROR)\n", samples, rb_samples);
+			pass = false;
+		} else {
+			printf("%10d %10d\n", samples, rb_samples);
+		}
+
+		prev_rb_samples = rb_samples;
+	}
+	glDeleteRenderbuffersEXT(1, &rb);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.7.3