[Piglit] [PATCH] tests/spec: added minmax test for shader storage buffer object

[Ilia Mirkin]

[please make sure to keep lists in cc]

On Mon, Mar 16, 2015 at 1:14 PM, Aditya Avinash
<adityaavinash1 at gmail.com> wrote:
>
>
> On Mon, Mar 16, 2015 at 11:36 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
>>
>> On Mon, Mar 16, 2015 at 11:16 AM, Aditya Atluri
>> <adityaavinash1 at gmail.com> 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.
>
>
> Sure.
>
>>
>>
>> > +
>> > +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...
>
>
> I think it's for "piglit-util-gl.h"

Try without it. I think that's already taken care of.

>
>>
>>
>> > +)
>> > +
>> > +link_libraries (
>> > +       piglitutil_${piglit_target_api}
>> > +       ${OPENGL_gl_LIBRARY}
>> > +       ${OPENGL_glu_LIBRARY}
>>
>> Why do you need glu here?
>
>
> I borrowed it from arb_compute_shader tests. Do you want me to remove from
> compute shaders too?

Don't worry about cleaning up other people's stuff.

>> > +       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?
>
>
> The extension spec specifies 2^24 but 4.5 spec specifies 2^27.

Hrmph. GL 4.4 still has it at 2^24. Just do 2^24 here... or if you
feel like being fancy, you could do

if (piglit_get_gl_version() >= 45)
  high limit
else
  low limit