On 25 October 2013 16:49, Anuj Phogat <anuj.pho...@gmail.com> wrote:
> V2: Use better technique to verify sample positions in fragment shader.
> Get rid of redundant projection matrix.
> Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com>
> ---
> tests/all.tests | 5 +
> .../arb_sample_shading/execution/CMakeLists.gl.txt | 1 +
> .../execution/builtin-gl-sample-position.cpp | 231
> +++++++++++++++++++++
> 3 files changed, 237 insertions(+)
> create mode 100644
> tests/spec/arb_sample_shading/execution/builtin-gl-sample-position.cpp
>
> diff --git a/tests/all.tests b/tests/all.tests
> index c5dd80c..9df5a94 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1352,6 +1352,11 @@ for num_samples in TEST_SAMPLE_COUNTS:
> executable = 'arb_sample_shading-{0} -auto'.format(test_name)
> arb_sample_shading[test_name] = PlainExecTest(executable)
>
> +for num_samples in TEST_SAMPLE_COUNTS:
> + test_name = 'builtin-gl-sample-position {0}'.format(num_samples)
> + executable = 'arb_sample_shading-{0} -auto'.format(test_name)
> + arb_sample_shading[test_name] = PlainExecTest(executable)
> +
> # Group ARB_debug_output
> arb_debug_output = Group()
> spec['ARB_debug_output'] = arb_debug_output
> diff --git a/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
> b/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
> index d2f1f4a..a832189 100644
> --- a/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
> +++ b/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
> @@ -14,4 +14,5 @@ piglit_add_executable (arb_sample_shading-api api.c)
> piglit_add_executable (arb_sample_shading-builtin-gl-num-samples
> builtin-gl-num-samples.cpp)
> piglit_add_executable (arb_sample_shading-builtin-gl-sample-id
> builtin-gl-sample-id.cpp)
> piglit_add_executable (arb_sample_shading-builtin-gl-sample-mask
> builtin-gl-sample-mask.cpp)
> +piglit_add_executable (arb_sample_shading-builtin-gl-sample-position
> builtin-gl-sample-position.cpp)
> # vim: ft=cmake:
> diff --git
> a/tests/spec/arb_sample_shading/execution/builtin-gl-sample-position.cpp
> b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-position.cpp
> new file mode 100644
> index 0000000..17ca45a
> --- /dev/null
> +++
> b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-position.cpp
> @@ -0,0 +1,231 @@
> +/*
> + * 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 builtin-gl-sample-position.cpp
> + * This test verifies that using gl_SamplePosition in fragment shader
> + * program works as per ARB_sample_shading specification.
> + *
> + **/
> +
> +#include "piglit-fbo.h"
> +using namespace piglit_util_fbo;
> +
> +const int pattern_width = 128; const int pattern_height = 128;
> +
> +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 int num_samples;
> +static unsigned prog, vao, vertex_buf;
> +static Fbo 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"
> + "in vec2 pos;\n"
> + "void main()\n"
> + "{\n"
> + " gl_Position = vec4(pos, 0.0, 1.0);\n"
> + "}\n";
> + static const char *frag =
> + "#version 130\n"
> + "#extension GL_ARB_sample_shading : enable\n"
> + "uniform int samples;\n"
> + "uniform vec2 expected_pos[8];\n"
>
This hardcoded 8 will prevent the test from working if num_samples > 8.
Since you've set up all.tests to test up to num_samples = 32, that's a
problem.
I'd recommend adding
#define MAX_NUM_SAMPLES 32
#define MAX_NUM_SAMPLES_STR "32"
to the top of the file. Then, here in the shader, you can do:
"uniform vec2 expected_pos[" MAX_NUM_SAMPLES_STR "];\n"
> + "out vec4 out_color;\n"
> + "void main()\n"
> + "{\n"
> + " if ((expected_pos[gl_SampleID] == gl_SamplePosition)
> ||\n"
> + " (samples == 0 && gl_SamplePosition == vec2(0.5,
> 0.5)))\n"
> + " out_color = vec4(0.0, 1.0, 0.0, 1.0);\n"
> + " else\n"
> + " out_color = vec4(1.0, 0.0, 0.0, 1.0);\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");
> + 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);
> +
> + /* 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
> +draw_pattern(GLint samples, GLfloat* sample_pos)
> +{
> + float vertex_data[4][4] = {
> + { -1, -1 },
> + { -1, 1 },
> + { 1, 1 },
> + { 1, -1 }};
> +
> + glUseProgram(prog);
> + glBindVertexArray(vao);
> +
> + /* Set up uniforms */
> + glUseProgram(prog);
> + glUniform1i(glGetUniformLocation(prog, "samples"), samples);
> + glUniform2fv(glGetUniformLocation(prog, "expected_pos"), 8,
> sample_pos);
>
This hardcoded 8 should be changed to MAX_NUM_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);
>
As with the other patches, this is going to a lot of duplicate work to draw
a rectangle. Just use piglit_draw_rect().
> +}
> +
> +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_ARB_sample_shading");
> +
> + /* Skip the test if num_samples > GL_MAX_SAMPLES */
> + GLint max_samples;
> + glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
> + if (num_samples > max_samples)
> + piglit_report_result(PIGLIT_SKIP);
>
Since the correctness of the test relies on num_samples being no larger
than MAX_NUM_SAMPLES, I'd recommend adding an error check here to check
that num_samples <= MAX_NUM_SAMPLES, and otherwise report PIGLIT_FAIL.
> +
> + singlesampled_fbo.setup(FboConfig(0,
> + pattern_width,
> + pattern_height));
> +
> + FboConfig msConfig(num_samples, pattern_width, pattern_height);
> + multisampled_fbo.setup(msConfig);
> +
> + compile_shader();
> + if (!piglit_check_gl_error(GL_NO_ERROR)) {
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +}
> +
> +bool test_ms_blit_scaled(Fbo ms_fbo)
> +{
> + GLint samples;
> + GLfloat sample_pos[16];
>
Array size should be MAX_NUM_SAMPLES * 2
> + GLfloat expected[4] = {0.0, 1.0, 0.0, 1.0};
> + bool pass = true;
> +
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, ms_fbo.handle);
> + glGetIntegerv(GL_SAMPLES, &samples);
> +
> + /* Expected color is computed after taking in to account
> multisample
> + * color resolve:
> + * ((sample_pos0 + sample_pos1 + sample_pos2 + sample_pos3) / 4.0)
> + */
> + for(int i = 0; i < samples; i++) {
> + glGetMultisamplefv(GL_SAMPLE_POSITION, i, &(sample_pos[2 *
> i]));
> + printf("sample[%d]_pos = {%f, %f}\n",
> + i, sample_pos[2 * i], sample_pos[2 * i + 1]);
> + }
> +
> + glClear(GL_COLOR_BUFFER_BIT);
> + draw_pattern(samples, sample_pos);
> +
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, ms_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, singlesampled_fbo.handle);
> + glClear(GL_COLOR_BUFFER_BIT);
> + glBlitFramebuffer(0, 0,
> + pattern_width, pattern_height,
> + 0, 0,
> + pattern_width, pattern_height,
> + GL_COLOR_BUFFER_BIT,
> + GL_NEAREST);
> +
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, singlesampled_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
> +
> + pass = piglit_probe_rect_rgba(0, 0, pattern_width,
> + pattern_width, expected)
> + && pass;
> + glClear(GL_COLOR_BUFFER_BIT);
> + glBlitFramebuffer(0, 0,
> + pattern_width, pattern_height,
> + 0, 0,
> + pattern_width, pattern_height,
> + GL_COLOR_BUFFER_BIT,
> + GL_NEAREST);
> +
> + piglit_present_results();
> + return pass;
> +}
> +
> +enum piglit_result
> +piglit_display()
> +{
> + bool pass = true;
> + pass = test_ms_blit_scaled(multisampled_fbo)
> + && pass;
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 1.8.1.4
With those changes, the patch is:
Reviewed-by: Paul Berry <stereotype...@gmail.com>
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
