Re: [Piglit] [PATCH] gl-4.5/compare-framebuffer-parameter-with-get: Fix return-type warning.
Reviewed-by: Antia PuentesOn mar, 2017-02-14 at 00:58 +, Vinson Lee wrote: > compare-framebuffer-parameter-with-get.c: In function > 'get_framebuffer_name': > compare-framebuffer-parameter-with-get.c:208:1: warning: control > reaches end of non-void function [-Wreturn-type] > } > ^ > > Fixes: d60f1fb839bc ("gl-4.5/compare-framebuffer-parameter-with-get: > add test") > Signed-off-by: Vinson Lee > --- > tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/spec/gl-4.5/compare-framebuffer-parameter-with- > get.c b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > index 5573d9838c1b..b9eab53a6b51 100644 > --- a/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > +++ b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > @@ -204,6 +204,7 @@ get_framebuffer_name(int index) > return "complete framebuffer"; > default: > assert(!"unknown framebuffer"); > + return "unknown framebuffer"; > } > } > ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH v2] gl-4.5/compare-framebuffer-parameter-with-get: add test
Reviewed-by: Antia PuentesTypo commented inline. On vie, 2017-02-03 at 10:05 +0100, Alejandro Piñeiro wrote: > OpenGL 4.5 spec introduced new valid pnames for > GetFramebufferParameter. > > Spec quotes and extra details about the test are included on the > test description at the beginning of the file. > > The test provides a way to run just one pname and one type of > framebuffer. Those options were added to make it more useful while > fixing things on mesa, but it is not intended to use them when running > the full suite. > > v2: > * Update after PIGLIT_SUBTEST_CONDITION macro (from piglit-util) > changed the name (from SUBTESTCONDITION) > * Summarize commit message, as the same text was already included > at the test description. > --- > tests/all.py | 1 + > tests/spec/gl-4.5/CMakeLists.gl.txt| 1 + > .../compare-framebuffer-parameter-with-get.c | 346 > + > 3 files changed, 348 insertions(+) > create mode 100644 tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > > diff --git a/tests/all.py b/tests/all.py > index 504b0e9..cd3e022 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -1316,6 +1316,7 @@ with profile.test_list.group_manager( > grouptools.join('spec', '!opengl 4.5')) as g: > g(['gl-4.5-named-framebuffer-draw-buffers-errors'], > 'named-framebuffer-draw-buffers-errors') > g(['gl-4.5-named-framebuffer-read-buffer-errors'], > 'named-framebuffer-read-buffer-errors') > +g(['gl-4.5-compare-framebuffer-parameter-with-get'], > 'compare-framebuffer-parameter-with-get') > > with profile.test_list.group_manager( > PiglitGLTest, > diff --git a/tests/spec/gl-4.5/CMakeLists.gl.txt > b/tests/spec/gl-4.5/CMakeLists.gl.txt > index 93736c9..9bf6b7d 100644 > --- a/tests/spec/gl-4.5/CMakeLists.gl.txt > +++ b/tests/spec/gl-4.5/CMakeLists.gl.txt > @@ -10,5 +10,6 @@ link_libraries ( > > piglit_add_executable (gl-4.5-named-framebuffer-draw-buffers-errors > named-framebuffer-draw-buffers-errors.c) > piglit_add_executable (gl-4.5-named-framebuffer-read-buffer-errors > named-framebuffer-read-buffer-errors.c) > +piglit_add_executable (gl-4.5-compare-framebuffer-parameter-with-get > compare-framebuffer-parameter-with-get.c) > > # vim: ft=cmake: > diff --git a/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > new file mode 100644 > index 000..4122d23 > --- /dev/null > +++ b/tests/spec/gl-4.5/compare-framebuffer-parameter-with-get.c > @@ -0,0 +1,346 @@ > +/** > + * Copyright 2017 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 compare-framebuffer-parameter-with-get. > + * > + * OpenGL 4.5 spec introduced new valid pnames for > + * GetFramebufferParameter. From OpenGL 4.5 spec, Section 9.2.3 > + * "Framebuffer Object Queries": > + * > + * "pname may also be one of DOUBLEBUFFER, IMPLEMENTATION_COLOR_- > + *READ_FORMAT, IMPLEMENTATION_COLOR_READ_TYPE, SAMPLES, > + *SAMPLE_BUFFERS, or STEREO, indicating the corresponding > + *framebuffer-dependent state from table 23.73. Values of > + *framebuffer-dependent state are identical to those that would be > + *obtained were the framebuffer object bound and queried using the > + *simple state queries in that table. These values may be queried > + *from either a framebuffer object or a default framebuffer." > + * > + * That "simple state queries in that table" are either glGetBooleanv > + * or glGetIntegerv. > + * > + * 4.5 also defines a new method, available on previous versions > + * through the direct state access extension, > + * GetNamedFramebufferParameteriv: > + * > + * "For GetFramebufferParameteriv, the framebuffer object is that > + *
Re: [Piglit] [PATCH 2/2] shader_runner: Fix get_ints on 32-bit systems.
On lun, 2016-06-06 at 16:02 -0700, Kenneth Graunke wrote: > On Monday, June 6, 2016 3:56:09 PM PDT Mark Janes wrote: > > > > Kenneth Graunkewrites: > > > > > > > > The new ARB_vertex_attrib_64bit tests specify integer uniform > > > values > > > as hex, such as 0xc21620c5. As an integer value, this is beyond > > > LONG_MAX > > > on 32-bit systems. The intent is to parse it as an unsigned hex > > > value and > > > bitcast it. > > > > > > However, we still need to handle parsing values with negative > > > signs. > > > > > > Using strtoll and truncating works. > > > > > > Signed-off-by: Kenneth Graunke > > > --- > > > tests/shaders/shader_runner.c | 2 +- > > > tests/util/piglit-vbo.cpp | 4 ++-- > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/tests/shaders/shader_runner.c > > > b/tests/shaders/shader_runner.c > > > index 94c7826..56fd97c 100644 > > > --- a/tests/shaders/shader_runner.c > > > +++ b/tests/shaders/shader_runner.c > > > @@ -1398,7 +1398,7 @@ get_ints(const char *line, int *ints, > > > unsigned count) > > > unsigned i; > > > > > > for (i = 0; i < count; i++) > > > - ints[i] = strtol(line, (char **) , 0); > > > + ints[i] = strtoll(line, (char **) , 0); > > > } > > > > > > > > > diff --git a/tests/util/piglit-vbo.cpp b/tests/util/piglit- > > > vbo.cpp > > > index fd7e72a..50e6731 100644 > > > --- a/tests/util/piglit-vbo.cpp > > > +++ b/tests/util/piglit-vbo.cpp > > > @@ -387,8 +387,8 @@ vertex_attrib_description::parse_datum(const > > > char **text, void *data) const > > > break; > > > } > > > case GL_INT: { > > > - long value = (long) strtoll(*text, , 0); > > > - if (errno == ERANGE) { > > > + long long value = strtoll(*text, , 0); > > > + if (errno == ERANGE || (unsigned long long) > > > value > 0xull) { > > ^^^ > > ^^ > > with this check removed, the series corrects all 32 bit failures > > introduced by b7eb469, and is > > > > Tested-by: Mark Janes > Right, the value > 0xull bit is bogus - the sign bit gets > extended. I've just dropped this locally. It removes a bit of > sanity > checking for bogus values written in .shader_test files, but we don't > sanity check most values, either. Thanks for fixing this. Patches 1-2 are: Reviewed-by: Antia Puentes ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH] arb_gpu_shader_fp64: Adds conversion tests generator
On jue, 2016-04-14 at 12:40 +0300, Andres Gomez wrote: > Also, removed 5 redundant tests replaced by > the generator. > > Signed-off-by: Andres Gomez> --- > generated_tests/CMakeLists.txt | 24 + > generated_tests/gen_conversion_fp64.py | 604 > + > .../templates/gen_conversion_fp64/base.mako| 12 + > .../gen_conversion_fp64/compiler.frag.mako | 3 + > .../gen_conversion_fp64/compiler.geom.mako | 3 + > .../gen_conversion_fp64/compiler.vert.mako | 3 + > .../gen_conversion_fp64/compiler_base.mako | 25 + > .../execution-zero-sign.frag.shader_test.mako | 8 + > .../execution-zero-sign.geom.shader_test.mako | 27 + > .../execution-zero-sign.vert.shader_test.mako | 16 + > .../execution.frag.shader_test.mako| 7 + > .../execution.geom.shader_test.mako| 27 + > .../execution.vert.shader_test.mako| 16 + > .../gen_conversion_fp64/execution_base.mako| 28 + > .../gen_conversion_fp64/shader-zero-sign.frag.mako | 18 + > .../gen_conversion_fp64/shader-zero-sign.geom.mako | 27 + > .../gen_conversion_fp64/shader-zero-sign.vert.mako | 20 + > .../templates/gen_conversion_fp64/shader.frag.mako | 16 + > .../templates/gen_conversion_fp64/shader.geom.mako | 25 + > .../templates/gen_conversion_fp64/shader.vert.mako | 18 + > .../templates/gen_conversion_fp64/shader_base.mako | 11 + > .../implicit-conversion-double-float-bad.vert | 20 - > .../implicit-conversion-dvec2-vec2-bad.vert| 20 - > .../implicit-conversion-dvec3-vec3-bad.vert| 20 - > .../implicit-conversion-dvec4-vec4-bad.vert| 20 - > .../compiler/implicit-conversions.vert | 115 > 26 files changed, 938 insertions(+), 195 deletions(-) > create mode 100644 generated_tests/gen_conversion_fp64.py > create mode 100644 > generated_tests/templates/gen_conversion_fp64/base.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/compiler.frag.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/compiler.geom.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/compiler.vert.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/compiler_base.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution-zero- > sign.frag.shader_test.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution-zero- > sign.geom.shader_test.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution-zero- > sign.vert.shader_test.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution.frag.shader_t > est.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution.geom.shader_t > est.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution.vert.shader_t > est.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/execution_base.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader-zero- > sign.frag.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader-zero- > sign.geom.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader-zero- > sign.vert.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader.frag.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader.geom.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader.vert.mako > create mode 100644 > generated_tests/templates/gen_conversion_fp64/shader_base.mako > delete mode 100644 tests/spec/arb_gpu_shader_fp64/compiler/implicit- > conversion-double-float-bad.vert > delete mode 100644 tests/spec/arb_gpu_shader_fp64/compiler/implicit- > conversion-dvec2-vec2-bad.vert > delete mode 100644 tests/spec/arb_gpu_shader_fp64/compiler/implicit- > conversion-dvec3-vec3-bad.vert > delete mode 100644 tests/spec/arb_gpu_shader_fp64/compiler/implicit- > conversion-dvec4-vec4-bad.vert > delete mode 100644 tests/spec/arb_gpu_shader_fp64/compiler/implicit- > conversions.vert > > diff --git a/generated_tests/CMakeLists.txt > b/generated_tests/CMakeLists.txt > index 3c5b11a..c2505e2 100644 > --- a/generated_tests/CMakeLists.txt > +++ b/generated_tests/CMakeLists.txt > @@ -130,6 +130,29 @@ piglit_make_generated_tests( > templates/gen_flat_interpolation_qualifier/template.frag.mak > o > ) > piglit_make_generated_tests( > + conversion_fp64.list > + gen_conversion_fp64.py > + templates/gen_conversion_fp64/base.mako > + templates/gen_conversion_fp64/compiler.frag.mako > + templates/gen_conversion_fp64/compiler.geom.mako > + templates/gen_conversion_fp64/compiler.vert.mako > + templates/gen_conversion_fp64/compiler_base.mako > +