[Piglit] [PATCH] Move multisample blit scaled tests to spec/ext_framebuffer_multisample_blit_scaled
Anuj Phogat
anuj.phogat at gmail.com
Fri Nov 8 16:09:56 PST 2013
We moved Fbo and TestPattern classes to a global location tests/util in
commit 9c1b2ac. Now, the functions from these classes can be utilized
from spec/ext_framebuffer_multisample_blit_scaled directory.
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
---
tests/all.tests | 5 +-
tests/spec/CMakeLists.txt | 1 +
.../ext_framebuffer_multisample/CMakeLists.gl.txt | 2 -
.../ext_framebuffer_multisample/blit-scaled.cpp | 378 ---------------------
.../negative-blit-scaled.cpp | 142 --------
.../CMakeLists.gl.txt | 13 +
.../CMakeLists.txt | 1 +
.../blit-scaled.cpp | 378 +++++++++++++++++++++
.../negative-blit-scaled.cpp | 142 ++++++++
9 files changed, 539 insertions(+), 523 deletions(-)
delete mode 100644 tests/spec/ext_framebuffer_multisample/blit-scaled.cpp
delete mode 100644 tests/spec/ext_framebuffer_multisample/negative-blit-scaled.cpp
create mode 100644 tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
create mode 100644 tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.txt
create mode 100644 tests/spec/ext_framebuffer_multisample_blit_scaled/blit-scaled.cpp
create mode 100644 tests/spec/ext_framebuffer_multisample_blit_scaled/negative-blit-scaled.cpp
diff --git a/tests/all.tests b/tests/all.tests
index d7ef93c..0215fa2 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1798,6 +1798,10 @@ add_plain_test(ext_framebuffer_blit, 'fbo-srgb-blit')
add_plain_test(ext_framebuffer_blit, 'fbo-sys-blit')
add_plain_test(ext_framebuffer_blit, 'fbo-sys-sub-blit')
+ext_framebuffer_multisample_blit_scaled = Group()
+spec['EXT_framebuffer_multisample_blit_scaled'] = ext_framebuffer_multisample_blit_scaled
+ext_framebuffer_multisample_blit_scaled['negative-blit-scaled'] = concurrent_test('ext_framebuffer_multisample_blit_scaled-negative-blit-scaled')
+
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')
@@ -1806,7 +1810,6 @@ ext_framebuffer_multisample['blit-mismatched-formats'] = concurrent_test('ext_fr
ext_framebuffer_multisample['dlist'] = concurrent_test('ext_framebuffer_multisample-dlist')
ext_framebuffer_multisample['enable-flag'] = PlainExecTest('ext_framebuffer_multisample-enable-flag -auto')
ext_framebuffer_multisample['minmax'] = concurrent_test('ext_framebuffer_multisample-minmax')
-ext_framebuffer_multisample['negative-blit-scaled'] = concurrent_test('ext_framebuffer_multisample-negative-blit-scaled')
ext_framebuffer_multisample['negative-copypixels'] = concurrent_test('ext_framebuffer_multisample-negative-copypixels')
ext_framebuffer_multisample['negative-copyteximage'] = concurrent_test('ext_framebuffer_multisample-negative-copyteximage')
ext_framebuffer_multisample['negative-max-samples'] = concurrent_test('ext_framebuffer_multisample-negative-max-samples')
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 4951c3c..a43bc41 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -45,6 +45,7 @@ add_subdirectory (arb_transform_feedback2)
add_subdirectory (ati_envmap_bumpmap)
add_subdirectory (ext_fog_coord)
add_subdirectory (ext_framebuffer_multisample)
+add_subdirectory (ext_framebuffer_multisample_blit_scaled)
add_subdirectory (ext_packed_depth_stencil)
add_subdirectory (ext_packed_float)
add_subdirectory (ext_texture_swizzle)
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 7f7958f..1542b92 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -23,7 +23,6 @@ piglit_add_executable (ext_framebuffer_multisample-alpha-to-one-single-sample-bu
draw-buffers-common.cpp alpha-to-one-single-sample-buffer.cpp)
piglit_add_executable (ext_framebuffer_multisample-bitmap common.cpp bitmap.cpp)
piglit_add_executable (ext_framebuffer_multisample-blit-flipped common.cpp blit-flipped.cpp)
-piglit_add_executable (ext_framebuffer_multisample-blit-scaled common.cpp blit-scaled.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-blit-mismatched-formats common.cpp blit-mismatched-formats.cpp)
@@ -48,7 +47,6 @@ piglit_add_executable (ext_framebuffer_multisample-negative-copypixels negative-
piglit_add_executable (ext_framebuffer_multisample-negative-copyteximage negative-copyteximage.c)
piglit_add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
piglit_add_executable (ext_framebuffer_multisample-negative-mismatched-samples negative-mismatched-samples.c)
-piglit_add_executable (ext_framebuffer_multisample-negative-blit-scaled common.cpp negative-blit-scaled.cpp)
piglit_add_executable (ext_framebuffer_multisample-negative-readpixels negative-readpixels.c)
piglit_add_executable (ext_framebuffer_multisample-no-color no-color.cpp common.cpp)
piglit_add_executable (ext_framebuffer_multisample-point-smooth common.cpp point-smooth.cpp)
diff --git a/tests/spec/ext_framebuffer_multisample/blit-scaled.cpp b/tests/spec/ext_framebuffer_multisample/blit-scaled.cpp
deleted file mode 100644
index 6221e8c..0000000
--- a/tests/spec/ext_framebuffer_multisample/blit-scaled.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * 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 blit-scaled.cpp
- *
- * This test verifies the accuracy of scaled blitting from a multisampled
- * buffer to a single-sampled buffer by comparing the output from following
- * rendering scenarios:
- * 1. Scaled blit using EXT_multisample_framebuffer_blit_scaled.
- * 2. Scaled blit using glsl shader program.
- *
- * Note: This test is specific to Intel's implementation of extension
- * EXT_multisample_framebuffer_blit_scaled and may not produce expected
- * results on other hardware. Currently test passes with all of the scaling
- * factors between 0.1 to 2.5 on Intel's i965 drivers and NVIDIA's proprietary
- * linux drivers.
- */
-
-#include "piglit-test-pattern.h"
-#include "piglit-fbo.h"
-using namespace piglit_util_fbo;
-using namespace piglit_util_test_pattern;
-
-const int pattern_width = 258; const int pattern_height = 258;
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = pattern_width * 2;
- config.window_height = pattern_height;
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static int num_samples;
-static TestPattern *test_pattern;
-static unsigned prog, vao, vertex_buf;
-const float srcX0 = 6, srcY0 = 7, dstX0 = 0, dstY0 = 0;
-const float srcX1 = pattern_width / 2, srcY1 = pattern_height / 2;
-static Fbo multisampled_tex, multisampled_fbo, singlesampled_fbo;
-
-static void
-print_usage_and_exit(char *prog_name)
-{
- printf("Usage: %s <num_samples>\n", prog_name);
- piglit_report_result(PIGLIT_FAIL);
-}
-
-void
-compile_shader(void)
-{
- static const char *vert =
- "#version 130\n"
- "uniform mat4 proj;\n"
- "in vec2 pos;\n"
- "in vec2 texCoord;\n"
- "out vec2 textureCoord;\n"
- "void main()\n"
- "{\n"
- " gl_Position = proj * vec4(pos, 0.0, 1.0);\n"
- " textureCoord = texCoord;\n"
- "}\n";
- /* Bilinear filtering of samples using shader program */
- static const char *frag =
- "#version 130\n"
- "#extension GL_ARB_texture_multisample : require\n"
- "in vec2 textureCoord;\n"
- "uniform sampler2DMS ms_tex;\n"
- "uniform int samples;\n"
- "uniform float xmin;\n"
- "uniform float ymin;\n"
- "uniform float xmax;\n"
- "uniform float ymax;\n"
- "out vec4 out_color;\n"
- "void main()\n"
- "{\n"
- " float x_f, y_f;\n"
- " vec4 s_0, s_1, s_2, s_3;\n"
- " vec2 s_0_coord, s_1_coord, s_2_coord, s_3_coord;\n"
- " float x_scale = 2.0;\n"
- " float y_scale = samples / 2.0;\n"
- " int sample_map[8] = int[8](5 , 2, 4, 6, 0, 3, 7, 1);\n"
- "\n"
- " vec2 tex_coord = vec2(textureCoord.x - 1.0 / 4,\n"
- " textureCoord.y - 1.0 / samples);\n"
- " tex_coord = vec2(x_scale * tex_coord.x,\n"
- " y_scale * tex_coord.y);\n"
- "\n"
- " if((tex_coord.x) < x_scale * xmin)\n"
- " tex_coord.x = x_scale * xmin;\n"
- " if(tex_coord.x >= x_scale * xmax - 1.0)\n"
- " tex_coord.x = x_scale * xmax - 1.0;\n"
- "\n"
- " if(tex_coord.y < y_scale * ymin)\n"
- " tex_coord.y = y_scale * ymin;\n"
- " if(tex_coord.y >= y_scale * ymax - 1.0)\n"
- " tex_coord.y = y_scale * ymax - 1.0;\n"
- "\n"
- " x_f = fract(tex_coord.x);\n"
- " y_f = fract(tex_coord.y);\n"
- "\n"
- " tex_coord.x = int(tex_coord.x) / x_scale;\n"
- " tex_coord.y = int(tex_coord.y) / y_scale;\n"
- "\n"
- " s_0_coord = tex_coord;\n"
- " s_1_coord = s_0_coord + vec2(1 / x_scale, 0 / y_scale);\n"
- " s_2_coord = s_0_coord + vec2(0 / x_scale, 1 / y_scale);\n"
- " s_3_coord = s_0_coord + vec2(1 / x_scale, 1 / y_scale);\n"
- "\n"
- " if (samples == 4) {\n"
- " s_0 = texelFetch(ms_tex, ivec2(s_0_coord),\n"
- " int(2 * fract(s_0_coord.x) +\n"
- " samples * fract(s_0_coord.y)));\n"
- " s_1 = texelFetch(ms_tex, ivec2(s_1_coord),\n"
- " int(2 * fract(s_1_coord.x) +\n"
- " samples * fract(s_1_coord.y)));\n"
- " s_2 = texelFetch(ms_tex, ivec2(s_2_coord),\n"
- " int(2 * fract(s_2_coord.x) +\n"
- " samples * fract(s_2_coord.y)));\n"
- " s_3 = texelFetch(ms_tex, ivec2(s_3_coord),\n"
- " int(2 * fract(s_3_coord.x) +\n"
- " samples * fract(s_3_coord.y)));\n"
- " } else {\n"
- " s_0 = texelFetch(ms_tex, ivec2(s_0_coord),\n"
- " sample_map[int(2 * fract(s_0_coord.x) +\n"
- " samples * fract(s_0_coord.y))]);\n"
- " s_1 = texelFetch(ms_tex, ivec2(s_1_coord),\n"
- " sample_map[int(2 * fract(s_1_coord.x) +\n"
- " samples * fract(s_1_coord.y))]);\n"
- " s_2 = texelFetch(ms_tex, ivec2(s_2_coord),\n"
- " sample_map[int(2 * fract(s_2_coord.x) +\n"
- " samples * fract(s_2_coord.y))]);\n"
- " s_3 = texelFetch(ms_tex, ivec2(s_3_coord),\n"
- " sample_map[int(2 * fract(s_3_coord.x) +\n"
- " samples * fract(s_3_coord.y))]);\n"
- " }\n"
- "\n"
- " vec4 color_x1 = mix(s_0, s_1, x_f);\n"
- " vec4 color_x2 = mix(s_2, s_3, x_f);\n"
- " out_color = mix(color_x1, color_x2, y_f);\n"
- "}\n";
- /* Compile program */
- prog = glCreateProgram();
- GLint vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vert);
- glAttachShader(prog, vs);
- piglit_check_gl_error(GL_NO_ERROR);
- GLint fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, frag);
- glAttachShader(prog, fs);
- glBindAttribLocation(prog, 0, "pos");
- glBindAttribLocation(prog, 1, "texCoord");
- glLinkProgram(prog);
- if (!piglit_link_check_status(prog)) {
- piglit_report_result(PIGLIT_FAIL);
- }
-
- /* Set up vertex array object */
- glGenVertexArrays(1, &vao);
- glBindVertexArray(vao);
-
- /* Set up vertex input buffer */
- glGenBuffers(1, &vertex_buf);
- glBindBuffer(GL_ARRAY_BUFFER, vertex_buf);
- glEnableVertexAttribArray(0);
- glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float),
- (void *) 0);
- glEnableVertexAttribArray(1);
- glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float),
- (void *) (2*sizeof(float)));
-
- /* Set up element input buffer to tesselate a quad into
- * triangles
- */
- unsigned int indices[6] = { 0, 1, 2, 0, 2, 3 };
- GLuint element_buf;
- glGenBuffers(1, &element_buf);
- glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, element_buf);
- glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices,
- GL_STATIC_DRAW);
-}
-
-void
-ms_blit_scaled_glsl(const Fbo *src_fbo, GLint samples)
-{
- const float proj[4][4] = {
- { 1, 0, 0, 0 },
- { 0, 1, 0, 0 },
- { 0, 0, 1, 0 },
- { 0, 0, 0, 1 }};
-
- float vertex_data[4][4] = {
- { -1, -1, srcX0, srcY0 },
- { -1, 1, srcX0, srcY1 },
- { 1, 1, srcX1, srcY1 },
- { 1, -1, srcX1, srcY0 }};
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, src_fbo->color_tex);
- glUseProgram(prog);
- glBindVertexArray(vao);
-
- /* Set up uniforms */
- glUseProgram(prog);
- glUniform1i(glGetUniformLocation(prog, "ms_tex"), 0);
- glUniform1i(glGetUniformLocation(prog, "samples"), samples);
- glUniform1f(glGetUniformLocation(prog, "xmin"), 0);
- glUniform1f(glGetUniformLocation(prog, "ymin"), 0);
- glUniform1f(glGetUniformLocation(prog, "xmax"),
- multisampled_fbo.config.width);
- glUniform1f(glGetUniformLocation(prog, "ymax"),
- multisampled_fbo.config.height);
- glUniformMatrix4fv(glGetUniformLocation(prog, "proj"), 1,
- GL_TRUE, &proj[0][0]);
-
- glBindBuffer(GL_ARRAY_BUFFER, vertex_buf);
- glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data,
- GL_STREAM_DRAW);
- glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, (void *) 0);
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- if (argc != 2)
- print_usage_and_exit(argv[0]);
-
- /* 1st arg: num_samples */
- char *endptr = NULL;
- num_samples = strtol(argv[1], &endptr, 0);
- if (endptr != argv[1] + strlen(argv[1]))
- print_usage_and_exit(argv[0]);
-
- piglit_require_gl_version(21);
- piglit_require_extension("GL_ARB_vertex_array_object");
- piglit_require_extension("GL_EXT_framebuffer_multisample_blit_scaled");
-
- /* Skip the test if num_samples > GL_MAX_SAMPLES */
- GLint max_samples;
- glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
- if (num_samples == 0 || num_samples > max_samples)
- piglit_report_result(PIGLIT_SKIP);
-
- singlesampled_fbo.setup(FboConfig(0,
- 2 * pattern_width,
- pattern_height));
- /* Create two multisample FBOs with same dimensions and sample count
- * but different color attachment types.
- */
- FboConfig msConfig(num_samples, pattern_width, pattern_height);
- msConfig.attach_texture = true;
- multisampled_tex.setup(msConfig);
- msConfig.attach_texture = false;
- multisampled_fbo.setup(msConfig);
-
- test_pattern = new Triangles();
- test_pattern->compile();
-
- compile_shader();
- if (!piglit_check_gl_error(GL_NO_ERROR)) {
- piglit_report_result(PIGLIT_FAIL);
- }
-}
-
-bool test_ms_blit_scaled(Fbo ms_fbo)
-{
- GLfloat scale;
- GLint samples;
- bool pass = true, result = true;
-
- /* Draw the test pattern into the framebuffer with texture
- * attachment.
- */
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_tex.handle);
- glViewport(0, 0, srcX1, srcY1);
- glGetIntegerv(GL_SAMPLES, &samples);
- glClear(GL_COLOR_BUFFER_BIT);
- test_pattern->draw(TestPattern::no_projection);
-
- if(!ms_fbo.config.attach_texture) {
- /* Blit the framebuffer with multisample texture attachment
- * into the framebuffer with multisample renderbuffer attachment.
- */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_tex.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_fbo.handle);
- glClear(GL_COLOR_BUFFER_BIT);
- glBlitFramebuffer(0, 0,
- multisampled_tex.config.width,
- multisampled_tex.config.height,
- 0, 0,
- multisampled_tex.config.width,
- multisampled_tex.config.height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST);
- }
-
- for(scale = 0.1; scale < 2.5f; scale += 0.1) {
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
- glClear(GL_COLOR_BUFFER_BIT);
-
- /* Do scaled resolve of multisampled_fbo to left half of
- * singlesampled_fbo.
- */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, ms_fbo.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
- glClearColor(0.0, 1.0, 0.0, 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
- glClearColor(0.0, 0.0, 0.0, 0.0);
- glEnable(GL_SCISSOR_TEST);
- glScissor(0, 0, pattern_width, pattern_height);
- glBlitFramebuffer(srcX0, srcY0,
- srcX1, srcY1,
- dstX0, dstY0,
- dstX0 + srcX1 * scale, dstY0 + srcY1 * scale,
- GL_COLOR_BUFFER_BIT,
- GL_SCALED_RESOLVE_FASTEST_EXT);
- glDisable(GL_SCISSOR_TEST);
-
- /* Use multisampled texture to draw in to right half of scaled
- * single-sampled buffer using shader program.
- */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_tex.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
- glViewport(pattern_width + dstX0, dstY0, srcX1 * scale, srcY1 * scale);
- ms_blit_scaled_glsl(&multisampled_tex, samples);
-
- pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
- glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
- result = piglit_probe_rect_halves_equal_rgba(0, 0,
- piglit_width,
- piglit_height);
- pass = result && pass;
-
- glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
- glBlitFramebuffer(0, 0, 2 * pattern_width, piglit_height,
- 0, 0, 2 * pattern_width, piglit_height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST);
- piglit_present_results();
- printf("MS attachment = %24s, scale = %f, result = %s\n",
- ms_fbo.config.attach_texture ?
- "MULTISAMPLE_TEXTURE" :
- "MULTISAMPLE_RENDERBUFFER",
- scale, result ? "pass" : "fail");
- }
- return pass;
-}
-
-enum piglit_result
-piglit_display()
-{
- bool pass = true;
- printf("Left Image: multisample scaled blit using extension.\n"
- "Right Image: multisample scaled blit using shader program.\n");
- pass = test_ms_blit_scaled(multisampled_tex)
- && pass;
- pass = test_ms_blit_scaled(multisampled_fbo)
- && pass;
- return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
diff --git a/tests/spec/ext_framebuffer_multisample/negative-blit-scaled.cpp b/tests/spec/ext_framebuffer_multisample/negative-blit-scaled.cpp
deleted file mode 100644
index e2b60fe..0000000
--- a/tests/spec/ext_framebuffer_multisample/negative-blit-scaled.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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 negative-blit-scaled.cpp
- *
- * This test verifies that expected GL errors are produced for cases mentioned
- * in EXT_framebuffer_multisample_blit_scaled extension:
- *
- * "If the draw framebuffer is framebuffer complete and has a value of
- * SAMPLE_BUFFERS that is greater than zero, or if the read framebuffer
- * is framebuffer complete and has a value of SAMPLE_BUFFERS that is
- * zero, then the error INVALID_OPERATION is generated if BlitFramebuffer
- * is called and the filter is SCALED_RESOLVE_FASTEST_EXT or
- * SCALED_RESOLVE_NICEST_EXT."
- *
- */
-
-#include "piglit-fbo.h"
-using namespace piglit_util_fbo;
-
-const int pattern_width = 256; const int pattern_height = 256;
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = pattern_width;
- config.window_height = pattern_height;
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static Fbo multisampled_fbo_1, multisampled_fbo_2, singlesampled_fbo;
-
-void
-piglit_init(int argc, char **argv)
-{
- bool pass = true;
- GLint max_samples;
-
- piglit_require_extension("GL_EXT_framebuffer_multisample_blit_scaled");
-
- glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
- FboConfig Config(max_samples, pattern_width, pattern_height);
- multisampled_fbo_1.setup(Config);
- multisampled_fbo_2.setup(Config);
- Config.num_samples = 0;
- singlesampled_fbo.setup(Config);
-
- if (!piglit_check_gl_error(GL_NO_ERROR)) {
- piglit_report_result(PIGLIT_FAIL);
- }
-
- /* Do multi-sample to multi-sample scaled blit */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_fbo_2.handle);
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- /* Do single-sample to single-sample scaled blit */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- /* Do multi-sample to single-sample scaled blit */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
- pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
- pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
-
- Config.color_internalformat = GL_RGBA8I;
- multisampled_fbo_1.setup(Config);
- singlesampled_fbo.setup(Config);
-
- /* Do multi-sample integer buffer to single-sample scaled blit */
- glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
- 0, 0, pattern_width, pattern_height,
- GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-
- piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
-}
-
-enum piglit_result
-piglit_display()
-{
- /* UNREACHED */
- return PIGLIT_FAIL;
-}
diff --git a/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
new file mode 100644
index 0000000..fd3e72f
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
@@ -0,0 +1,13 @@
+include_directories(
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+ piglitutil_${piglit_target_api}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+)
+
+piglit_add_executable (ext_framebuffer_multisample_blit_scaled-blit-scaled blit-scaled.cpp)
+piglit_add_executable (ext_framebuffer_multisample_blit_scaled-negative-blit-scaled negative-blit-scaled.cpp)
diff --git a/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.txt b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/ext_framebuffer_multisample_blit_scaled/blit-scaled.cpp b/tests/spec/ext_framebuffer_multisample_blit_scaled/blit-scaled.cpp
new file mode 100644
index 0000000..6221e8c
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample_blit_scaled/blit-scaled.cpp
@@ -0,0 +1,378 @@
+/*
+ * 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 blit-scaled.cpp
+ *
+ * This test verifies the accuracy of scaled blitting from a multisampled
+ * buffer to a single-sampled buffer by comparing the output from following
+ * rendering scenarios:
+ * 1. Scaled blit using EXT_multisample_framebuffer_blit_scaled.
+ * 2. Scaled blit using glsl shader program.
+ *
+ * Note: This test is specific to Intel's implementation of extension
+ * EXT_multisample_framebuffer_blit_scaled and may not produce expected
+ * results on other hardware. Currently test passes with all of the scaling
+ * factors between 0.1 to 2.5 on Intel's i965 drivers and NVIDIA's proprietary
+ * linux drivers.
+ */
+
+#include "piglit-test-pattern.h"
+#include "piglit-fbo.h"
+using namespace piglit_util_fbo;
+using namespace piglit_util_test_pattern;
+
+const int pattern_width = 258; const int pattern_height = 258;
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = pattern_width * 2;
+ config.window_height = pattern_height;
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static int num_samples;
+static TestPattern *test_pattern;
+static unsigned prog, vao, vertex_buf;
+const float srcX0 = 6, srcY0 = 7, dstX0 = 0, dstY0 = 0;
+const float srcX1 = pattern_width / 2, srcY1 = pattern_height / 2;
+static Fbo multisampled_tex, multisampled_fbo, singlesampled_fbo;
+
+static void
+print_usage_and_exit(char *prog_name)
+{
+ printf("Usage: %s <num_samples>\n", prog_name);
+ piglit_report_result(PIGLIT_FAIL);
+}
+
+void
+compile_shader(void)
+{
+ static const char *vert =
+ "#version 130\n"
+ "uniform mat4 proj;\n"
+ "in vec2 pos;\n"
+ "in vec2 texCoord;\n"
+ "out vec2 textureCoord;\n"
+ "void main()\n"
+ "{\n"
+ " gl_Position = proj * vec4(pos, 0.0, 1.0);\n"
+ " textureCoord = texCoord;\n"
+ "}\n";
+ /* Bilinear filtering of samples using shader program */
+ static const char *frag =
+ "#version 130\n"
+ "#extension GL_ARB_texture_multisample : require\n"
+ "in vec2 textureCoord;\n"
+ "uniform sampler2DMS ms_tex;\n"
+ "uniform int samples;\n"
+ "uniform float xmin;\n"
+ "uniform float ymin;\n"
+ "uniform float xmax;\n"
+ "uniform float ymax;\n"
+ "out vec4 out_color;\n"
+ "void main()\n"
+ "{\n"
+ " float x_f, y_f;\n"
+ " vec4 s_0, s_1, s_2, s_3;\n"
+ " vec2 s_0_coord, s_1_coord, s_2_coord, s_3_coord;\n"
+ " float x_scale = 2.0;\n"
+ " float y_scale = samples / 2.0;\n"
+ " int sample_map[8] = int[8](5 , 2, 4, 6, 0, 3, 7, 1);\n"
+ "\n"
+ " vec2 tex_coord = vec2(textureCoord.x - 1.0 / 4,\n"
+ " textureCoord.y - 1.0 / samples);\n"
+ " tex_coord = vec2(x_scale * tex_coord.x,\n"
+ " y_scale * tex_coord.y);\n"
+ "\n"
+ " if((tex_coord.x) < x_scale * xmin)\n"
+ " tex_coord.x = x_scale * xmin;\n"
+ " if(tex_coord.x >= x_scale * xmax - 1.0)\n"
+ " tex_coord.x = x_scale * xmax - 1.0;\n"
+ "\n"
+ " if(tex_coord.y < y_scale * ymin)\n"
+ " tex_coord.y = y_scale * ymin;\n"
+ " if(tex_coord.y >= y_scale * ymax - 1.0)\n"
+ " tex_coord.y = y_scale * ymax - 1.0;\n"
+ "\n"
+ " x_f = fract(tex_coord.x);\n"
+ " y_f = fract(tex_coord.y);\n"
+ "\n"
+ " tex_coord.x = int(tex_coord.x) / x_scale;\n"
+ " tex_coord.y = int(tex_coord.y) / y_scale;\n"
+ "\n"
+ " s_0_coord = tex_coord;\n"
+ " s_1_coord = s_0_coord + vec2(1 / x_scale, 0 / y_scale);\n"
+ " s_2_coord = s_0_coord + vec2(0 / x_scale, 1 / y_scale);\n"
+ " s_3_coord = s_0_coord + vec2(1 / x_scale, 1 / y_scale);\n"
+ "\n"
+ " if (samples == 4) {\n"
+ " s_0 = texelFetch(ms_tex, ivec2(s_0_coord),\n"
+ " int(2 * fract(s_0_coord.x) +\n"
+ " samples * fract(s_0_coord.y)));\n"
+ " s_1 = texelFetch(ms_tex, ivec2(s_1_coord),\n"
+ " int(2 * fract(s_1_coord.x) +\n"
+ " samples * fract(s_1_coord.y)));\n"
+ " s_2 = texelFetch(ms_tex, ivec2(s_2_coord),\n"
+ " int(2 * fract(s_2_coord.x) +\n"
+ " samples * fract(s_2_coord.y)));\n"
+ " s_3 = texelFetch(ms_tex, ivec2(s_3_coord),\n"
+ " int(2 * fract(s_3_coord.x) +\n"
+ " samples * fract(s_3_coord.y)));\n"
+ " } else {\n"
+ " s_0 = texelFetch(ms_tex, ivec2(s_0_coord),\n"
+ " sample_map[int(2 * fract(s_0_coord.x) +\n"
+ " samples * fract(s_0_coord.y))]);\n"
+ " s_1 = texelFetch(ms_tex, ivec2(s_1_coord),\n"
+ " sample_map[int(2 * fract(s_1_coord.x) +\n"
+ " samples * fract(s_1_coord.y))]);\n"
+ " s_2 = texelFetch(ms_tex, ivec2(s_2_coord),\n"
+ " sample_map[int(2 * fract(s_2_coord.x) +\n"
+ " samples * fract(s_2_coord.y))]);\n"
+ " s_3 = texelFetch(ms_tex, ivec2(s_3_coord),\n"
+ " sample_map[int(2 * fract(s_3_coord.x) +\n"
+ " samples * fract(s_3_coord.y))]);\n"
+ " }\n"
+ "\n"
+ " vec4 color_x1 = mix(s_0, s_1, x_f);\n"
+ " vec4 color_x2 = mix(s_2, s_3, x_f);\n"
+ " out_color = mix(color_x1, color_x2, y_f);\n"
+ "}\n";
+ /* Compile program */
+ prog = glCreateProgram();
+ GLint vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vert);
+ glAttachShader(prog, vs);
+ piglit_check_gl_error(GL_NO_ERROR);
+ GLint fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, frag);
+ glAttachShader(prog, fs);
+ glBindAttribLocation(prog, 0, "pos");
+ glBindAttribLocation(prog, 1, "texCoord");
+ glLinkProgram(prog);
+ if (!piglit_link_check_status(prog)) {
+ piglit_report_result(PIGLIT_FAIL);
+ }
+
+ /* Set up vertex array object */
+ glGenVertexArrays(1, &vao);
+ glBindVertexArray(vao);
+
+ /* Set up vertex input buffer */
+ glGenBuffers(1, &vertex_buf);
+ glBindBuffer(GL_ARRAY_BUFFER, vertex_buf);
+ glEnableVertexAttribArray(0);
+ glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float),
+ (void *) 0);
+ glEnableVertexAttribArray(1);
+ glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float),
+ (void *) (2*sizeof(float)));
+
+ /* Set up element input buffer to tesselate a quad into
+ * triangles
+ */
+ unsigned int indices[6] = { 0, 1, 2, 0, 2, 3 };
+ GLuint element_buf;
+ glGenBuffers(1, &element_buf);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, element_buf);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices,
+ GL_STATIC_DRAW);
+}
+
+void
+ms_blit_scaled_glsl(const Fbo *src_fbo, GLint samples)
+{
+ const float proj[4][4] = {
+ { 1, 0, 0, 0 },
+ { 0, 1, 0, 0 },
+ { 0, 0, 1, 0 },
+ { 0, 0, 0, 1 }};
+
+ float vertex_data[4][4] = {
+ { -1, -1, srcX0, srcY0 },
+ { -1, 1, srcX0, srcY1 },
+ { 1, 1, srcX1, srcY1 },
+ { 1, -1, srcX1, srcY0 }};
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, src_fbo->color_tex);
+ glUseProgram(prog);
+ glBindVertexArray(vao);
+
+ /* Set up uniforms */
+ glUseProgram(prog);
+ glUniform1i(glGetUniformLocation(prog, "ms_tex"), 0);
+ glUniform1i(glGetUniformLocation(prog, "samples"), samples);
+ glUniform1f(glGetUniformLocation(prog, "xmin"), 0);
+ glUniform1f(glGetUniformLocation(prog, "ymin"), 0);
+ glUniform1f(glGetUniformLocation(prog, "xmax"),
+ multisampled_fbo.config.width);
+ glUniform1f(glGetUniformLocation(prog, "ymax"),
+ multisampled_fbo.config.height);
+ glUniformMatrix4fv(glGetUniformLocation(prog, "proj"), 1,
+ GL_TRUE, &proj[0][0]);
+
+ glBindBuffer(GL_ARRAY_BUFFER, vertex_buf);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data,
+ GL_STREAM_DRAW);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, (void *) 0);
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ if (argc != 2)
+ print_usage_and_exit(argv[0]);
+
+ /* 1st arg: num_samples */
+ char *endptr = NULL;
+ num_samples = strtol(argv[1], &endptr, 0);
+ if (endptr != argv[1] + strlen(argv[1]))
+ print_usage_and_exit(argv[0]);
+
+ piglit_require_gl_version(21);
+ piglit_require_extension("GL_ARB_vertex_array_object");
+ piglit_require_extension("GL_EXT_framebuffer_multisample_blit_scaled");
+
+ /* Skip the test if num_samples > GL_MAX_SAMPLES */
+ GLint max_samples;
+ glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+ if (num_samples == 0 || num_samples > max_samples)
+ piglit_report_result(PIGLIT_SKIP);
+
+ singlesampled_fbo.setup(FboConfig(0,
+ 2 * pattern_width,
+ pattern_height));
+ /* Create two multisample FBOs with same dimensions and sample count
+ * but different color attachment types.
+ */
+ FboConfig msConfig(num_samples, pattern_width, pattern_height);
+ msConfig.attach_texture = true;
+ multisampled_tex.setup(msConfig);
+ msConfig.attach_texture = false;
+ multisampled_fbo.setup(msConfig);
+
+ test_pattern = new Triangles();
+ test_pattern->compile();
+
+ compile_shader();
+ if (!piglit_check_gl_error(GL_NO_ERROR)) {
+ piglit_report_result(PIGLIT_FAIL);
+ }
+}
+
+bool test_ms_blit_scaled(Fbo ms_fbo)
+{
+ GLfloat scale;
+ GLint samples;
+ bool pass = true, result = true;
+
+ /* Draw the test pattern into the framebuffer with texture
+ * attachment.
+ */
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_tex.handle);
+ glViewport(0, 0, srcX1, srcY1);
+ glGetIntegerv(GL_SAMPLES, &samples);
+ glClear(GL_COLOR_BUFFER_BIT);
+ test_pattern->draw(TestPattern::no_projection);
+
+ if(!ms_fbo.config.attach_texture) {
+ /* Blit the framebuffer with multisample texture attachment
+ * into the framebuffer with multisample renderbuffer attachment.
+ */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_tex.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_fbo.handle);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBlitFramebuffer(0, 0,
+ multisampled_tex.config.width,
+ multisampled_tex.config.height,
+ 0, 0,
+ multisampled_tex.config.width,
+ multisampled_tex.config.height,
+ GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ }
+
+ for(scale = 0.1; scale < 2.5f; scale += 0.1) {
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ /* Do scaled resolve of multisampled_fbo to left half of
+ * singlesampled_fbo.
+ */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, ms_fbo.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
+ glClearColor(0.0, 1.0, 0.0, 1.0);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glClearColor(0.0, 0.0, 0.0, 0.0);
+ glEnable(GL_SCISSOR_TEST);
+ glScissor(0, 0, pattern_width, pattern_height);
+ glBlitFramebuffer(srcX0, srcY0,
+ srcX1, srcY1,
+ dstX0, dstY0,
+ dstX0 + srcX1 * scale, dstY0 + srcY1 * scale,
+ GL_COLOR_BUFFER_BIT,
+ GL_SCALED_RESOLVE_FASTEST_EXT);
+ glDisable(GL_SCISSOR_TEST);
+
+ /* Use multisampled texture to draw in to right half of scaled
+ * single-sampled buffer using shader program.
+ */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_tex.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
+ glViewport(pattern_width + dstX0, dstY0, srcX1 * scale, srcY1 * scale);
+ ms_blit_scaled_glsl(&multisampled_tex, samples);
+
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
+ result = piglit_probe_rect_halves_equal_rgba(0, 0,
+ piglit_width,
+ piglit_height);
+ pass = result && pass;
+
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
+ glBlitFramebuffer(0, 0, 2 * pattern_width, piglit_height,
+ 0, 0, 2 * pattern_width, piglit_height,
+ GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ piglit_present_results();
+ printf("MS attachment = %24s, scale = %f, result = %s\n",
+ ms_fbo.config.attach_texture ?
+ "MULTISAMPLE_TEXTURE" :
+ "MULTISAMPLE_RENDERBUFFER",
+ scale, result ? "pass" : "fail");
+ }
+ return pass;
+}
+
+enum piglit_result
+piglit_display()
+{
+ bool pass = true;
+ printf("Left Image: multisample scaled blit using extension.\n"
+ "Right Image: multisample scaled blit using shader program.\n");
+ pass = test_ms_blit_scaled(multisampled_tex)
+ && pass;
+ pass = test_ms_blit_scaled(multisampled_fbo)
+ && pass;
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
diff --git a/tests/spec/ext_framebuffer_multisample_blit_scaled/negative-blit-scaled.cpp b/tests/spec/ext_framebuffer_multisample_blit_scaled/negative-blit-scaled.cpp
new file mode 100644
index 0000000..e2b60fe
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample_blit_scaled/negative-blit-scaled.cpp
@@ -0,0 +1,142 @@
+/*
+ * 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 negative-blit-scaled.cpp
+ *
+ * This test verifies that expected GL errors are produced for cases mentioned
+ * in EXT_framebuffer_multisample_blit_scaled extension:
+ *
+ * "If the draw framebuffer is framebuffer complete and has a value of
+ * SAMPLE_BUFFERS that is greater than zero, or if the read framebuffer
+ * is framebuffer complete and has a value of SAMPLE_BUFFERS that is
+ * zero, then the error INVALID_OPERATION is generated if BlitFramebuffer
+ * is called and the filter is SCALED_RESOLVE_FASTEST_EXT or
+ * SCALED_RESOLVE_NICEST_EXT."
+ *
+ */
+
+#include "piglit-fbo.h"
+using namespace piglit_util_fbo;
+
+const int pattern_width = 256; const int pattern_height = 256;
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = pattern_width;
+ config.window_height = pattern_height;
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+static Fbo multisampled_fbo_1, multisampled_fbo_2, singlesampled_fbo;
+
+void
+piglit_init(int argc, char **argv)
+{
+ bool pass = true;
+ GLint max_samples;
+
+ piglit_require_extension("GL_EXT_framebuffer_multisample_blit_scaled");
+
+ glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+ FboConfig Config(max_samples, pattern_width, pattern_height);
+ multisampled_fbo_1.setup(Config);
+ multisampled_fbo_2.setup(Config);
+ Config.num_samples = 0;
+ singlesampled_fbo.setup(Config);
+
+ if (!piglit_check_gl_error(GL_NO_ERROR)) {
+ piglit_report_result(PIGLIT_FAIL);
+ }
+
+ /* Do multi-sample to multi-sample scaled blit */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_fbo_2.handle);
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ /* Do single-sample to single-sample scaled blit */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ /* Do multi-sample to single-sample scaled blit */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+ Config.color_internalformat = GL_RGBA8I;
+ multisampled_fbo_1.setup(Config);
+ singlesampled_fbo.setup(Config);
+
+ /* Do multi-sample integer buffer to single-sample scaled blit */
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo_1.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_FASTEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ glBlitFramebuffer(0, 0, pattern_width / 2, pattern_height / 2,
+ 0, 0, pattern_width, pattern_height,
+ GL_COLOR_BUFFER_BIT, GL_SCALED_RESOLVE_NICEST_EXT);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+ piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display()
+{
+ /* UNREACHED */
+ return PIGLIT_FAIL;
+}
--
1.8.1.4
More information about the Piglit
mailing list