[Piglit] [PATCH 2/3] Add test to verify glBlitFramebuffer with non-matching buffer sizes

[Anuj Phogat]

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
---
 tests/all.tests                                    |    1 +
 .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 +
 .../blit-mismatched-sizes.cpp                      |   79 ++++++++++++++++++++
 3 files changed, 81 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp

diff --git a/tests/all.tests b/tests/all.tests
index 550d330..ee6b22d 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1311,6 +1311,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['blit-mismatched-samples'] = concurrent_test('ext_framebuffer_multisample-blit-mismatched-samples')
+ext_framebuffer_multisample['blit-mismatched-sizes'] = concurrent_test('ext_framebuffer_multisample-blit-mismatched-sizes')
 ext_framebuffer_multisample['dlist'] = concurrent_test('ext_framebuffer_multisample-dlist')
 ext_framebuffer_multisample['minmax'] = concurrent_test('ext_framebuffer_multisample-minmax')
 ext_framebuffer_multisample['negative-copypixels'] = concurrent_test('ext_framebuffer_multisample-negative-copypixels')
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 146b80e..f4efa91 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -11,6 +11,7 @@ link_libraries (
 
 piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp)
 piglit_add_executable (ext_framebuffer_multisample-blit-mismatched-samples common.cpp blit-mismatched-samples.cpp)
+piglit_add_executable (ext_framebuffer_multisample-blit-mismatched-sizes common.cpp blit-mismatched-sizes.cpp)
 piglit_add_executable (ext_framebuffer_multisample-dlist dlist.c)
 piglit_add_executable (ext_framebuffer_multisample-formats common.cpp formats.cpp)
 piglit_add_executable (ext_framebuffer_multisample-line-smooth common.cpp line-smooth.cpp)
diff --git a/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp b/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp
new file mode 100644
index 0000000..4e20bed
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2012 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 blit-mismatched-sizes.cpp
+ *
+ * This test verifies if glBlitFramebuffer() throws GL_INVALID_OPERATION with
+ * non-matching buffer sizes for multisample framebuffer objects.
+ *
+ * We initialize two FBOs with minimum supported sample count, do blitting
+ * operation between non-matching buffer sizes and then query the gl error.
+ *
+ * Author: Anuj Phogat <anuj.phogat at gmail.com>
+ */
+
+#include "common.h"
+
+int piglit_width = 256; int piglit_height = 256;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
+
+const int pattern_width = 256; const int pattern_height = 256;
+Fbo src_fbo, dst_fbo;
+
+enum piglit_result
+piglit_display()
+{
+	bool pass = true;
+
+	/* Blit multisample-to-multisample with non-matching buffer size */
+	glBindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo.handle);
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst_fbo.handle);
+	glBlitFramebuffer(0, 0, pattern_width, pattern_height,
+			  0, 0, pattern_width / 2, pattern_height,
+			  GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+	/* Scaling blits are not allowed for multisample frambuffers. Here
+	 * GL_INVALID_OPERATION is an expected gl error
+	 */
+	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+	return (pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	piglit_require_gl_version(30);
+
+	/* Passing sample count = 1 will create the FBOs with minimum supported
+	 * sample count.
+	 */
+	src_fbo.setup(FboConfig(1 /* sample count */,
+				pattern_width,
+				pattern_height));
+
+	dst_fbo.setup(FboConfig(1 /* sample count */,
+				pattern_width,
+				pattern_height));
+}
-- 
1.7.7.6