<div dir="ltr"><div>I already resent a patch with concurrent=True. I'll keep that in mind for next patches. </div>Thank you! :) </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Mar 16, 2015 at 2:50 PM, Dylan Baker <<a href="mailto:baker.dylan.c@gmail.com" target="_blank">baker.dylan.c@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Mon, Mar 16, 2015 at 11:36:00AM -0400, Ilia Mirkin wrote: > On Mon, Mar 16, 2015 at 11:16 AM, Aditya Atluri > <<a href="mailto:adityaavinash1@gmail.com">adityaavinash1@gmail.com</a>> wrote: > > --- > > tests/all.py | 5 ++ > > tests/spec/CMakeLists.txt | 1 + > > .../CMakeLists.gl.txt | 15 +++++ > > .../CMakeLists.txt | 1 + > > .../spec/arb_shader_storage_buffer_object/minmax.c | 67 ++++++++++++++++++++++ > > 5 files changed, 89 insertions(+) > > create mode 100644 tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt > > create mode 100644 tests/spec/arb_shader_storage_buffer_object/CMakeLists.txt > > create mode 100644 tests/spec/arb_shader_storage_buffer_object/minmax.c > > > > diff --git a/tests/all.py b/tests/all.py > > index 1c3c889..49ae468 100644 > > --- a/tests/all.py > > +++ b/tests/all.py > > @@ -3964,6 +3964,11 @@ with profile.group_manager( > > > > with profile.group_manager( > > PiglitGLTest, > > + grouptools.join('spec', 'arb_shader_storage_buffer_object')) as g: > > + g(['arb_shader_storage_buffer_object-minmax'], 'minmax') > > I think you want run_concurrent=True here as well. No need, concurrent is the default now. <div class="HOEnZb"><div class="h5"> > > > + > > +with profile.group_manager( > > + PiglitGLTest, > > grouptools.join('spec', 'ext_polygon_offset_clamp')) as g: > > g(['ext_polygon_offset_clamp-draw'], run_concurrent=True) > > g(['ext_polygon_offset_clamp-dlist'], run_concurrent=True) > > diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt > > index 7423589..a680c1b 100644 > > --- a/tests/spec/CMakeLists.txt > > +++ b/tests/spec/CMakeLists.txt > > @@ -84,6 +84,7 @@ add_subdirectory (arb_vertex_array_bgra) > > add_subdirectory (arb_vertex_buffer_object) > > add_subdirectory (arb_vertex_program) > > add_subdirectory (arb_copy_buffer) > > +add_subdirectory (arb_shader_storage_buffer_object) > > add_subdirectory (glsl-1.10) > > add_subdirectory (glsl-1.20) > > add_subdirectory (glsl-1.30) > > diff --git a/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt > > new file mode 100644 > > index 0000000..d2a9d87 > > --- /dev/null > > +++ b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.gl.txt > > @@ -0,0 +1,15 @@ > > +include_directories( > > + ${GLEXT_INCLUDE_DIR} > > + ${OPENGL_INCLUDE_PATH} > > + ${piglit_SOURCE_DIR}/tests/util > > Is this last line necessary? In another test, I didn't need it... > > > +) > > + > > +link_libraries ( > > + piglitutil_${piglit_target_api} > > + ${OPENGL_gl_LIBRARY} > > + ${OPENGL_glu_LIBRARY} > > Why do you need glu here? > > > +) > > + > > +piglit_add_executable (arb_shader_storage_buffer_object-minmax minmax.c) > > + > > +# vim: ft=cmake: > > diff --git a/tests/spec/arb_shader_storage_buffer_object/CMakeLists.txt b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.txt > > new file mode 100644 > > index 0000000..144a306 > > --- /dev/null > > +++ b/tests/spec/arb_shader_storage_buffer_object/CMakeLists.txt > > @@ -0,0 +1 @@ > > +piglit_include_target_api() > > diff --git a/tests/spec/arb_shader_storage_buffer_object/minmax.c b/tests/spec/arb_shader_storage_buffer_object/minmax.c > > new file mode 100644 > > index 0000000..0e9ec22 > > --- /dev/null > > +++ b/tests/spec/arb_shader_storage_buffer_object/minmax.c > > @@ -0,0 +1,67 @@ > > +/* > > + * Copyright © 2015 Aditya Atluri <<a href="mailto:adityaavinash1@gmail.com">adityaavinash1@gmail.com</a>> > > + * > > + * 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 > > + * > > + * Test for the minimum maximum values specified in the > > + * ARB_shader_storage_buffer_object. > > I think you're missing the word 'spec' here before the period. > > > + */ > > +#include "piglit-util-gl.h" > > +#include "minmax-test.h" > > + > > +PIGLIT_GL_TEST_CONFIG_BEGIN > > + > > + config.supports_gl_compat_version = 40; > > + config.supports_gl_core_version = 40; > > + > > +PIGLIT_GL_TEST_CONFIG_END > > + > > +enum piglit_result > > +piglit_display(void) > > +{ > > + /* UNREACHED */ > > + return PIGLIT_FAIL; > > +} > > + > > +void > > +piglit_init(int argc, char **argv) > > +{ > > + piglit_require_extension("GL_ARB_shader_storage_buffer_object"); > > + piglit_print_minmax_header(); > > + > > + piglit_test_min_int(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, 0); > > + piglit_test_min_int(GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS, 0); > > + piglit_test_min_int(GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS, 0); > > + piglit_test_min_int(GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS, 0); > > + piglit_test_min_int(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, 8); > > + piglit_test_min_int(GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS, 8); > > + piglit_test_min_int(GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS, 8); > > + piglit_test_min_int(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS, 8); > > + piglit_test_min_int64(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, 134217728); // 2^27 > > This was right before with 2^24. I just checked in the GL core spec, > and it also has 2^24 just like in the extension. Why did you change > it? > > > + piglit_test_max_int(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT, 256); > > + piglit_test_min_int(GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES, 8); > > + > > + if (!piglit_check_gl_error(GL_NO_ERROR)) > > + piglit_report_result(PIGLIT_FAIL); > > + piglit_report_result(piglit_minmax_pass ? PIGLIT_PASS : PIGLIT_FAIL); > > +} > > -- > > 1.9.1 > > > > _______________________________________________ > > 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> > _______________________________________________ > 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> </div></div></blockquote></div> -- <div class="gmail_signature"><div dir="ltr"><div><div>Regards, </div>Aditya Atluri, </div><div>USA. </div> </div></div> </div>