[Piglit] [PATCH] tests/spec: added minmax test for shader_storage_buffer
Aditya Avinash
adityaavinash1 at gmail.com
Sun Mar 15 18:28:16 PDT 2015
On Sunday, March 15, 2015, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> On Sun, Mar 15, 2015 at 12:10 AM, Aditya Atluri
> <adityaavinash1 at gmail.com <javascript:;>> wrote:
> > ---
> >
> > The tests pass on AMD proprietary drivers but,
> > fails on NVIDIA cards at offset alignment (32 only)
> >
> > 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..02d8c13 100644
> > --- a/tests/all.py
> > +++ b/tests/all.py
> > @@ -3963,6 +3963,11 @@ with profile.group_manager(
> > grouptools.join('compiler', 'work_group_size_too_large'))
> >
> > with profile.group_manager(
> > + PiglitGLTest,
> > + grouptools.join('spec',
> 'arb_shader_storage_buffer_object')) as g:
> > + g(['arb_shader_storage_buffer_object-minmax'], 'minmax')
> > +
> > +with profile.group_manager(
> > PiglitGLTest,
> > grouptools.join('spec', 'ext_polygon_offset_clamp')) as g:
> > g(['ext_polygon_offset_clamp-draw'], 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
> > +)
> > +
> > +link_libraries (
> > + piglitutil_${piglit_target_api}
> > + ${OPENGL_gl_LIBRARY}
> > + ${OPENGL_glu_LIBRARY}
> > +)
> > +
> > +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..0e27b04
> > --- /dev/null
> > +++ b/tests/spec/arb_shader_storage_buffer_object/minmax.c
> > @@ -0,0 +1,67 @@
> > +/*
> > + * Copyright © 2015 Aditya Atluri <adityaavinash1 at gmail.com
> <javascript:;>>
> > + *
> > + * 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.
> > + */
> > +#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 = 43;
>
> According to the spec:
>
> OpenGL 4.0 (either core or compatibility profile) is required.
>
> TBH I'm not sure why that is, but not _too_ much harm in requiring it,
> I guess. Either way, your gl_core_version needs to be 40, not 43.
I searched 4.0 spec doc for it and did not find it. So, I used different
version for core
Do you want me to change it?
>
> > +
> > +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, 16777216
> ); // 2^24
>
> Remove space before ')'.
>
> > + piglit_test_min_int(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT,
> 256);
>
> I _thought_ this was crazy, but the spec does indeed require this
> totally ridiculous behaviour. However looking at the GL 4.5 spec, it
> says, below table 23.64 on page 618:
>
> The value of SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT is the maximum
> allowed, not the minimum
>
> Which makes a *ton* more sense. And will make the nvidia blob driver
> pass (since it returns 32).
>
It was weird when it failed on proprietary NVIDIA drivers. The spec
mentioned 256 under minimum, so I wrote for minimum.
I did not check 4.5 spec. I thought the number will be same for all
versions.
I'll change it.
Thank you!
> > + 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
> > Piglit at lists.freedesktop.org <javascript:;>
> > http://lists.freedesktop.org/mailman/listinfo/piglit
>
--
Regards,
*Aditya Atluri,*
*USA.*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20150315/f31102bd/attachment-0001.html>
More information about the Piglit
mailing list