Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com>
---
tests/all.tests | 6 +
.../ext_framebuffer_multisample/CMakeLists.gl.txt | 1 +
.../blit-scaled-glsl.cpp | 268 +++++++++++++++++++++
3 files changed, 275 insertions(+)
create mode 100644 tests/spec/ext_framebuffer_multisample/blit-scaled-glsl.cpp
diff --git a/tests/all.tests b/tests/all.tests
index 09b67a2..892f0b7 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1641,6 +1641,12 @@ for num_samples in MSAA_SAMPLE_COUNTS:
test_name)
ext_framebuffer_multisample[test_name] = PlainExecTest(executable)
+for num_samples in MSAA_SAMPLE_COUNTS:
+ test_name = ' '.join(['blit-scaled-glsl', str(num_samples)])
+ executable = 'ext_framebuffer_multisample-{0} -auto'.format(
+ test_name)
+ ext_framebuffer_multisample[test_name] = PlainExecTest(executable)
+
ext_framebuffer_object = Group()
spec['EXT_framebuffer_object'] = ext_framebuffer_object
add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX1')
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 8143497..6778de8 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -24,6 +24,7 @@ piglit_add_executable
(ext_framebuffer_multisample-alpha-to-one-single-sample-bu
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-scaled-glsl common.cpp
blit-scaled-glsl.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)
diff --git a/tests/spec/ext_framebuffer_multisample/blit-scaled-glsl.cpp
b/tests/spec/ext_framebuffer_multisample/blit-scaled-glsl.cpp
new file mode 100644
index 0000000..e42b87a
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample/blit-scaled-glsl.cpp
@@ -0,0 +1,268 @@
+/*
+ * 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-glsl.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. multisample buffer to single sample buffer scaled blit using extension
+ * EXT_multisample_framebuffer_blit_scaled extension.
+ * 2. multisample buffer to single sample buffer scaled blit implemented
+ * using glsl shader program.
+ */
+
+#include "common.h"
+
+const int pattern_width = 256; const int pattern_height = 256;
+const float w = pattern_width / 2; const float h = pattern_height / 2;
+int num_samples;
+
+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 Fbo multisampled_fbo, singlesampled_fbo;
+GLuint prog, vao, vertex_buf;
+static TestPattern *test_pattern;
+static Test *test = NULL;
+
+static void
+print_usage_and_exit(char *prog_name)
+{
+ printf("Usage: %s <num_samples>\n", prog_name);
+ piglit_report_result(PIGLIT_FAIL);
+}
+
+void
+compile_ms_scaled_blit_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";
+
+ static const char *frag =
+ "#version 130\n"
+ "#extension GL_ARB_texture_multisample : require\n"
+ "in vec2 textureCoord;\n"
+ "uniform sampler2DMS msTex;\n"
+ "uniform int samples;\n"
+ "out vec4 out_color;\n"
+ "void main()\n"
+ "{\n"
+ " int i;\n"
+ " out_color = vec4(0.0, 0.0, 0.0, 0.0);\n"
+ " for (i = 0; i < samples; i++)\n"
+ " out_color = out_color + texelFetch(msTex,
ivec2(textureCoord), i);\n"
+ " out_color = out_color / 4;\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
+do_multisample_scaled_blit(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, 0, 0 },
+ { -1, 1, 0, h },
+ { 1, 1, w, h },
+ { 1, -1, w, 0 }};
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, src_fbo->color_tex);
+
+ glUseProgram(prog);
+ glBindVertexArray(vao);
+
+ /* Set up uniforms */
+ glUseProgram(prog);
+ glUniformMatrix4fv(glGetUniformLocation(prog, "proj"), 1, GL_TRUE,
&proj[0][0]);
+ glUniform1i(glGetUniformLocation(prog, "msTex"), 0);
+ glUniform1i(glGetUniformLocation(prog, "samples"), samples);
+
+ 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));
+ FboConfig msConfig(num_samples, pattern_width, pattern_height);
+ msConfig.attach_texture = true;
+ multisampled_fbo.setup(msConfig);
+
+ test_pattern = new Triangles();
+ test_pattern->compile();
+
+ test = create_test(TEST_TYPE_COLOR, num_samples,
+ false /*small*/,
+ true /* combine_depth_stencil */,
+ pattern_width, pattern_height,
+ 16 /* supersample_factor */);
+
+ compile_ms_scaled_blit_shader();
+ if (!piglit_check_gl_error(GL_NO_ERROR)) {
+ piglit_report_result(PIGLIT_FAIL);
+ }
+}
+
+enum piglit_result
+piglit_display()
+{
+ GLfloat scale;
+ GLint samples;
+ bool pass = true, result = true;
+
+ /* Draw the test pattern into the framebuffer with multisample
+ * texture attachment.
+ */
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, multisampled_fbo.handle);
+ glGetIntegerv(GL_SAMPLES, &samples);
+ glViewport(0, 0, w, h);
+ test_pattern->draw(TestPattern::no_projection);
+
+ printf("Left: multisample scaled blit using extension.\n"
+ "Right: multisample scaled blit using shader program.\n");
+
+ for(scale = 0.1; scale < 2.1f; 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 */
+// printf("ms to ss scaled blit using extension.\n");
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER,
singlesampled_fbo.handle);
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBlitFramebuffer(0, 0, w, h,
+ 0, 0, w * scale, h * scale,
+ GL_COLOR_BUFFER_BIT,
+ GL_SCALED_RESOLVE_FASTEST_EXT);
+
+ /* Use multisampled texture to draw in to right half of scaled
+ * single-sampled buffer using shader program.
+ */
+// printf("ms to ss scaled blit using shader program.\n");
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, multisampled_fbo.handle);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER,
singlesampled_fbo.handle);
+ glViewport(pattern_width, 0, w * scale, h * scale);
+ do_multisample_scaled_blit(&multisampled_fbo, samples);
+
+ pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
+
+// printf("ss non-scaled blit to window system framebuffer.\n");
+ 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);
+
+ result = test->measure_accuracy();
+ pass = result && pass;
+ piglit_present_results();
+ printf("scaling_factor = %f, result = %s\n\n",
+ scale, result ? "pass" : "fail");
+ }
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
--
1.8.1.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
