<div dir="ltr">On 25 October 2013 16:49, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">V2: Get rid of redundant projection matrix. Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> --- tests/all.tests | 5 + .../arb_sample_shading/execution/CMakeLists.gl.txt | 1 + .../execution/builtin-gl-sample-mask.cpp | 236 +++++++++++++++++++++ 3 files changed, 242 insertions(+) create mode 100644 tests/spec/arb_sample_shading/execution/builtin-gl-sample-mask.cpp </blockquote><div> </div><div>I have similar concerns with this patch to the concerns I have with patch 3. The test should be rewritten to use ARB_texture_multisample so that we can verify the correct mapping of gl_SampleMask bits to samples. As it is, this test would still pass if the implementation got the bits in the wrong order. </div><div>Also, I notice that the loop in piglit_display() tests the following sequence of sample masks: </div><div>0x00 </div><div>0x01 </div><div>0x03 </div><div>0x07 </div><div>0x0f </div><div> 0x1f </div><div>0x3f </div><div>0x7f </div><div>0xff That's a problem because: </div><div>(a) some implementations support >8 sample MSAA; on those implementations we only test the first 8 samples. </div><div> (b) all of the values tested consist of a sequence of 0 bits followed by a sequence of 1 bits. We also need to test bit sequences which alternate between 1's and 0's. </div><div>(c) we aren't doing anything to verify that the upper bits of gl_SampleMask[0] (those beyond the first gl_NumSamples bits) are ignored. </div><div>(d) since we are setting gl_SampleMask[0] to a uniform value, we won't catch bugs if the implementation mixes up sample masks between one fragment and a nearby fragment. </div><div> </div><div> Here's a possible way to revise the test: </div><div>1. In the fragment shader, instead of setting gl_SampleMask[0] to a uniform value, set it to a value that's dynamically computed based on gl_FragCoord. For example, a possible formula might be (int(gl_FragCoord.x) * 0x10204081) ^ (int(gl_FragCoord.y) * 0x01010101). (The nice thing about this formula is that for your 128x128 image size, it produces a bit pattern where no two bits of gl_SampleMask[0] are correllated, so it should exercise the hardware pretty thoroughly). </div><div>2. Render to a multisample texture. </div><div>3. Read from the multisample texture using a second fragment shader that computes the same formula, figures out for each pixel which samples are expected to be green vs. black, and checks that all the samples have the expected color. </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> diff --git a/tests/all.tests b/tests/all.tests index d861a91..c5dd80c 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1347,6 +1347,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-mask {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 35f2905..d2f1f4a 100644 --- a/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt +++ b/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt @@ -13,4 +13,5 @@ link_libraries ( 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) # vim: ft=cmake: diff --git a/tests/spec/arb_sample_shading/execution/builtin-gl-sample-mask.cpp b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-mask.cpp new file mode 100644 index 0000000..2b4e7d7 --- /dev/null +++ b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-mask.cpp @@ -0,0 +1,236 @@ +/* + * 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-mask.cpp + * This test verifies that supplying a value to gl_SampleMask[] + * 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 sample_mask;\n" + "out vec4 out_color;\n" + "void main()\n" + "{\n" + " gl_SampleMask[0] = sample_mask;\n" + " out_color = vec4(0.0, 1.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, GLint sample_mask) +{ + 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, "sample_mask"), sample_mask); + + 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_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); + + 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_builtin_sample_mask(Fbo ms_fbo, GLint sample_mask) +{ + GLint i, samples; + bool pass = true, is_sample_enabled[8]; + GLfloat expected[4] = {0.0, 0.0, 0.0, 0.0}; + + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, ms_fbo.handle); + glGetIntegerv(GL_SAMPLES, &samples); + + /* Expected color is computed after taking in to account the + * multisample color resolve: + */ + for (i = 0; i < samples; i++) { + is_sample_enabled[i] = (sample_mask >> i) & 0x1; + if (is_sample_enabled[i]) { + expected[1] += 1.0; + expected[3] += 1.0; + } + } + expected[1] /= samples; + expected[3] /= samples; + + glClear(GL_COLOR_BUFFER_BIT); + draw_pattern(samples, sample_mask); + + 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; + printf("sample_mask = 0x%x result= %s\n", + sample_mask, pass ? "pass": "fail"); + 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; + int i, sample_mask = 0; + + for(i = 0; i <= 8; i++) { + pass = test_builtin_sample_mask(multisampled_fbo, sample_mask) + && pass; + sample_mask |= (0x1 << i); + } + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} -- 1.8.1.4 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div>