On Nov 17, 2016 10:56 AM, "Plamena Manolova" <<a href="mailto:plamena.manolova@intel.com">plamena.manolova@intel.com</a>> wrote: > > A basic test to check whether the values written to gl_SampleMaskIn > are still correct after enabling the ARB_post_depth_coverage > extension. > > Signed-off-by: Plamena Manolova <<a href="mailto:plamena.manolova@intel.com">plamena.manolova@intel.com</a>> > --- > tests/all.py | 5 + > tests/spec/CMakeLists.txt | 1 + > .../spec/arb_post_depth_coverage/CMakeLists.gl.txt | 11 + > tests/spec/arb_post_depth_coverage/CMakeLists.txt | 1 + > tests/spec/arb_post_depth_coverage/basic.c | 237 +++++++++++++++++++++ > 5 files changed, 255 insertions(+) > create mode 100644 tests/spec/arb_post_depth_coverage/CMakeLists.gl.txt > create mode 100644 tests/spec/arb_post_depth_coverage/CMakeLists.txt > create mode 100644 tests/spec/arb_post_depth_coverage/basic.c > > diff --git a/tests/all.py b/tests/all.py > index 16c46e8..9f47da5 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -4755,6 +4755,11 @@ with profile.test_list.group_manager( > g(['arb_shader_image_load_store-unused'], 'unused') > > with profile.test_list.group_manager( > + PiglitGLTest, > + grouptools.join('spec', 'arb_post_depth_coverage')) as g: > + g(['arb_post_depth_coverage-basic']) > + > +with profile.test_list.group_manager( > PiglitGLTest, > grouptools.join('spec', 'arb_shader_image_size')) as g: > g(['arb_shader_image_size-builtin'], 'builtin') > diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt > index a057c02..4377196 100644 > --- a/tests/spec/CMakeLists.txt > +++ b/tests/spec/CMakeLists.txt > @@ -152,3 +152,4 @@ add_subdirectory (arb_query_buffer_object) > add_subdirectory (ext_window_rectangles) > add_subdirectory (arb_shader_texture_image_samples) > add_subdirectory (arb_texture_barrier) > +add_subdirectory (arb_post_depth_coverage) > diff --git a/tests/spec/arb_post_depth_coverage/CMakeLists.gl.txt b/tests/spec/arb_post_depth_coverage/CMakeLists.gl.txt > new file mode 100644 > index 0000000..1a71774 > --- /dev/null > +++ b/tests/spec/arb_post_depth_coverage/CMakeLists.gl.txt > @@ -0,0 +1,11 @@ > +include_directories( > + ${GLEXT_INCLUDE_DIR} > + ${OPENGL_INCLUDE_PATH} > +) > + > +link_libraries ( > + piglitutil_${piglit_target_api} > + ${OPENGL_gl_LIBRARY} > +) > + > +piglit_add_executable (arb_post_depth_coverage-basic basic.c) > diff --git a/tests/spec/arb_post_depth_coverage/CMakeLists.txt b/tests/spec/arb_post_depth_coverage/CMakeLists.txt > new file mode 100644 > index 0000000..144a306 > --- /dev/null > +++ b/tests/spec/arb_post_depth_coverage/CMakeLists.txt > @@ -0,0 +1 @@ > +piglit_include_target_api() > diff --git a/tests/spec/arb_post_depth_coverage/basic.c b/tests/spec/arb_post_depth_coverage/basic.c > new file mode 100644 > index 0000000..d230e6c > --- /dev/null > +++ b/tests/spec/arb_post_depth_coverage/basic.c > @@ -0,0 +1,237 @@ > +/* > + * Copyright (c) 2015 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. > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 45; > + config.supports_gl_core_version = 45; Do we really need to require 4.5? The extension doesn't have any required version. > + config.window_width = 160; > + config.window_height = 160; > + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_DOUBLE; > +PIGLIT_GL_TEST_CONFIG_END > + > +static GLuint prog1, prog2, vao, ssbo; > +static GLint *sample_mask; > + > +static const char *vs_text = > + "#version 430\n" > + "in vec4 pos_in;\n" > + "void main()\n" > + "{\n" > + " gl_Position = pos_in;\n" > + "}\n"; > + > +static const char *fs_text1 = > + "#version 430\n" > + "out vec4 color;\n" > + "void main()\n" > + "{\n" > + " gl_FragDepth = 0.5f;\n" > + " color = vec4(0.0, 1.0, 0.0, 1.0);\n" > + "}\n"; > + > +static const char *fs_text2 = > + "#version 430\n" Are you missing a #extension here? That may indicate that you missed a compiler bit in mesa to grab and check for the extension enable. > + "out vec4 color;\n" > + "layout(early_fragment_tests) in;\n" > + "layout(post_depth_coverage) in;\n" > + "layout(location = 2) uniform int width;" > + "layout(std430, binding = 3) buffer MaskOutput {" > + " int data[];" > + "} mask_output;" > + "void main()\n" > + "{\n" > + " int index = int(gl_FragCoord.y) * width + int(gl_FragCoord.x);\n" > + " mask_output.data[index] = int(gl_SampleMaskIn[0]);\n" > + " color = vec4(1.0, 0.0, 0.0, 1.0);\n" > + "}\n"; > + > +static GLuint > +make_shader_program1(void) > +{ > + GLuint prog; > + > + prog = piglit_build_simple_program(vs_text, fs_text1); > + glUseProgram(prog); > + > + glBindAttribLocation(prog, 0, "pos_in"); > + > + glLinkProgram(prog); > + > + if (!piglit_check_gl_error(GL_NO_ERROR)) { > + piglit_report_result(PIGLIT_FAIL); > + } > + > + return prog; > +} > + > +static GLuint > +make_shader_program2(void) > +{ > + GLuint prog; > + > + prog = piglit_build_simple_program(vs_text, fs_text2); > + glUseProgram(prog); > + > + glBindAttribLocation(prog, 0, "pos_in"); > + > + glLinkProgram(prog); > + > + if (!piglit_check_gl_error(GL_NO_ERROR)) { > + piglit_report_result(PIGLIT_FAIL); > + } > + > + return prog; > +} > + > + > +static GLuint > +make_ssbo(void) > +{ > + GLuint ssbo; > + glGenBuffers(1, &ssbo); > + glBindBuffer(GL_SHADER_STORAGE_BUFFER, ssbo); > + > + if (!piglit_check_gl_error(GL_NO_ERROR)) { > + piglit_report_result(PIGLIT_FAIL); > + } > + > + return ssbo; > +} > + > +static GLuint > +make_vao(void) > +{ > + static const float pos_tc[12][2] = { > + { -1.0, -1.0 }, > + { 0.0, -1.0 }, > + { 0.0, 1.0 }, > + { 0.0, 1.0 }, > + { -1.0, 1.0 }, > + { -1.0, -1.0 }, > + { -1.0, -1.0 }, > + { 1.0, -1.0 }, > + { 1.0, 1.0 }, > + { 1.0, 1.0 }, > + { -1.0, 1.0 }, > + { -1.0, -1.0 } > + }; > + const int stride = sizeof(pos_tc[0]); > + GLuint vbo, vao; > + > + glGenVertexArrays(1, &vao); > + glBindVertexArray(vao); > + > + glGenBuffers(1, &vbo); > + glBindBuffer(GL_ARRAY_BUFFER, vbo); > + glBufferData(GL_ARRAY_BUFFER, sizeof(pos_tc), pos_tc, GL_STATIC_DRAW); > + piglit_check_gl_error(GL_NO_ERROR); > + > + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, stride, (void *) 0); > + > + glEnableVertexAttribArray(0); > + > + if (!piglit_check_gl_error(GL_NO_ERROR)) { > + piglit_report_result(PIGLIT_FAIL); > + } > + > + return vbo; > +} > + > + > +void > +piglit_init(int argc, char **argv) > +{ > + piglit_require_gl_version(45); The test preamble you declared at the top will do the version check for you. > + piglit_require_extension("GL_ARB_post_depth_coverage"); > + prog1 = make_shader_program1(); > + prog2 = make_shader_program2(); > + vao = make_vao(); > + ssbo = make_ssbo(); > +} > + > + > +enum piglit_result > +piglit_display(void) > +{ > + float green[4] = {0.0, 1.0, 0.0, 1.0}; > + float red[4] = {1.0, 0.0, 0.0, 1.0}; > + bool pass = true; > + int i, j; > + > + glEnable(GL_DEPTH_TEST); > + glViewport(0, 0, piglit_width, piglit_height); > + sample_mask = (GLint*) malloc (sizeof(GLint) * (piglit_width * piglit_height)); > + for (i = 0; i < piglit_width * piglit_height; i++) { > + sample_mask[i] = 0; > + } > + glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(GLint) * (piglit_width * > + piglit_height), &sample_mask[0], GL_DYNAMIC_COPY); > + glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, ssbo); > + > + glClearColor(0.0, 0.0, 0.0, 1.0); > + glEnable(GL_DEPTH_TEST); > + glEnable(GL_STENCIL_TEST); > + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); > + glUseProgram(prog1); > + glStencilFunc(GL_ALWAYS, 1, 0xFF); > + glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); > + glDrawArrays(GL_TRIANGLES, 0, 6); > + glUseProgram(prog2); > + glStencilFunc(GL_NOTEQUAL, 1, 0xFF); > + glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); > + glUniform1i(2, piglit_width); > + glDrawArrays(GL_TRIANGLES, 6, 6); > + > + glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT); If you're using getBufferSubData I don't think you need this. > + glGetBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, sizeof(GLint) * > + piglit_width * piglit_height, &sample_mask[0]); > + > + for (i = 0; i < piglit_width; i++) { > + for (j = 0; j < piglit_height; j++) { > + if (i >= piglit_width / 2) { > + if (sample_mask[piglit_width * j + i] != 1) { > + pass = false; > + break; > + } > + } else { > + if (sample_mask[piglit_width * j + i] != 0) { > + pass = false; > + break; > + } > + } > + } > + } > + > + pass = piglit_probe_rect_rgba(0, 0, piglit_width / 2, piglit_height, > + green) && pass; > + pass = piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, > + piglit_height, red) && pass; > + piglit_present_results(); > + > + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; > + > + free(sample_mask); > + return pass ? PIGLIT_PASS : PIGLIT_FAIL; > +} > -- > 2.7.4 > > _______________________________________________ > Piglit mailing list > <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/piglit">https://lists.freedesktop.org/mailman/listinfo/piglit</a>