On Mon, Aug 31, 2015 at 11:55 PM, Ian Romanick <i...@freedesktop.org> wrote: > From: Ian Romanick <ian.d.roman...@intel.com> > > Also verify that setting a float with glUniform*dv generates an error. > > NOTE: Mesa currently fails the matrix tests. > > Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > Cc: Dave Airlie <airl...@redhat.com> > --- > I will have a patch out on the mesa-dev list that _should_ fix this. > I can't fully run it on my driver. :( The bug was discovered while > inspecting the code to make other, unrelated changes. > > tests/all.py | 1 + > .../execution/CMakeLists.gl.txt | 1 + > .../execution/wrong-type-setter.c | 198 > +++++++++++++++++++++ > 3 files changed, 200 insertions(+) > create mode 100644 > tests/spec/arb_gpu_shader_fp64/execution/wrong-type-setter.c > > diff --git a/tests/all.py b/tests/all.py > index fcfc5cd..b21a5df 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -2105,6 +2105,7 @@ with profile.group_manager( > g(['arb_gpu_shader_fp64-tf-interleaved']) > g(['arb_gpu_shader_fp64-tf-interleaved-aligned']) > g(['arb_gpu_shader_fp64-getuniformdv']) > + g(['arb_gpu_shader_fp64-wrong-type-setter']) > > with profile.group_manager( > PiglitGLTest, > diff --git a/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt > b/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt > index 6738363..650b312 100644 > --- a/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt > +++ b/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt > @@ -15,3 +15,4 @@ piglit_add_executable (arb_gpu_shader_fp64-tf-interleaved > tf-interleaved.c) > piglit_add_executable (arb_gpu_shader_fp64-tf-interleaved-aligned > tf-interleaved-aligned.c) > piglit_add_executable > (arb_gpu_shader_fp64-double-gettransformfeedbackvarying > double-gettransformfeedbackvarying.c) > piglit_add_executable (arb_gpu_shader_fp64-getuniformdv getuniformdv.c) > +piglit_add_executable (arb_gpu_shader_fp64-wrong-type-setter > wrong-type-setter.c) > diff --git a/tests/spec/arb_gpu_shader_fp64/execution/wrong-type-setter.c > b/tests/spec/arb_gpu_shader_fp64/execution/wrong-type-setter.c > new file mode 100644 > index 0000000..7940ef2 > --- /dev/null > +++ b/tests/spec/arb_gpu_shader_fp64/execution/wrong-type-setter.c > @@ -0,0 +1,198 @@ > +/* > + * Copyright © 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. > + */ > + > +/** > + * \name wronge-type-setter.c > + * Try setting a double uniform with a float setter, expect an error. > + * > + * Also try the vice-versa combinations. > + */ > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + > + config.supports_gl_core_version = 32; > + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; > + > +PIGLIT_GL_TEST_CONFIG_END > + > +static const char vs_source[] = > + "#version 330\n"
The test description above only requires version 150. AFAIK there's no need for anything higher... > + "#extension GL_ARB_gpu_shader_fp64: require\n" > + "\n" > + "uniform float f1;\n" > + "uniform vec2 f2;\n" > + "uniform vec3 f3;\n" > + "uniform vec4 f4;\n" > + "\n" > + "uniform mat2 fm22;\n" > + "uniform mat2x3 fm23;\n" > + "uniform mat2x4 fm24;\n" > + "uniform mat3x2 fm32;\n" > + "uniform mat3 fm33;\n" > + "uniform mat3x4 fm34;\n" > + "uniform mat4x2 fm42;\n" > + "uniform mat4x3 fm43;\n" > + "uniform mat4 fm44;\n" > + "\n" > + "flat out vec4 outf;\n" > + "\n" > + "uniform double d1;\n" > + "uniform dvec2 d2;\n" > + "uniform dvec3 d3;\n" > + "uniform dvec4 d4;\n" > + "\n" > + "uniform dmat2 dm22;\n" > + "uniform dmat2x3 dm23;\n" > + "uniform dmat2x4 dm24;\n" > + "uniform dmat3x2 dm32;\n" > + "uniform dmat3 dm33;\n" > + "uniform dmat3x4 dm34;\n" > + "uniform dmat4x2 dm42;\n" > + "uniform dmat4x3 dm43;\n" > + "uniform dmat4 dm44;\n" > + "\n" > + "flat out dvec4 outd;\n" > + "\n" > + "void main()\n" > + "{\n" > + " outf = vec4(f1) +\n" > + " vec4(fm22 * f2, 0, 0) +\n" > + " vec4(fm32 * f3, 0, 0) +\n" > + " vec4(fm42 * f4, 0, 0) +\n" > + " vec4(fm23 * f2, 0) +\n" > + " vec4(fm33 * f3, 0) +\n" > + " vec4(fm43 * f4, 0) +\n" > + " vec4(fm24 * f2) +\n" > + " vec4(fm34 * f3) +\n" > + " vec4(fm44 * f4);\n" > + " outd = dvec4(d1) +\n" > + " dvec4(dm22 * d2, 0, 0) +\n" > + " dvec4(dm32 * d3, 0, 0) +\n" > + " dvec4(dm42 * d4, 0, 0) +\n" > + " dvec4(dm23 * d2, 0) +\n" > + " dvec4(dm33 * d3, 0) +\n" > + " dvec4(dm43 * d4, 0) +\n" > + " dvec4(dm24 * d2) +\n" > + " dvec4(dm34 * d3) +\n" > + " dvec4(dm44 * d4);\n" > + " gl_Position = vec4(0);\n" > + "}\n" > + ; > + > +static const char fs_source[] = > + "#version 330\n" > + "#extension GL_ARB_gpu_shader_fp64: require\n" > + "\n" > + "flat in vec4 outf;\n" > + "flat in dvec4 outd;\n" > + "\n" > + "out vec4 frag_color;\n" > + "\n" > + "void main()\n" > + "{\n" > + " frag_color = outf + vec4(outd);\n" > + "}\n" > + ; > + > +#define TRY_UNIFORM(name, setter, data) > \ > + do { \ > + printf("Trying \"%s\" with %s...\n", name, # setter); \ > + loc = glGetUniformLocation(prog, name); \ > + if (loc == -1) { \ > + printf("Could not get location for \"%s\".\n", \ > + name); \ > + pass = false; \ > + } else { \ > + setter(loc, 1, data); \ > + pass = piglit_check_gl_error(GL_INVALID_OPERATION) \ > + && pass; \ > + } \ > + } while (false) > + > +#define TRY_MATRIX(name, setter, data) \ > + do { \ > + printf("Trying \"%s\" with %s...\n", name, # setter); \ > + loc = glGetUniformLocation(prog, name); \ > + if (loc == -1) { \ > + printf("Could not get location for \"%s\".\n", \ > + name); \ > + pass = false; \ > + } else { \ > + setter(loc, 1, GL_FALSE, data); \ > + pass = piglit_check_gl_error(GL_INVALID_OPERATION) \ > + && pass; \ > + } \ > + } while (false) > + > +void piglit_init(int argc, char **argv) > +{ > + bool pass = true; > + GLuint prog; > + const float float_junk[16] = { 0, }; > + const double double_junk[16] = { 0, }; > + GLuint loc; > + > + piglit_require_extension("GL_ARB_gpu_shader_fp64"); > + > + prog = piglit_build_simple_program(vs_source, fs_source); > + glUseProgram(prog); > + > + TRY_UNIFORM("f1", glUniform1dv, double_junk); > + TRY_UNIFORM("f2", glUniform2dv, double_junk); > + TRY_UNIFORM("f3", glUniform3dv, double_junk); > + TRY_UNIFORM("f4", glUniform4dv, double_junk); > + > + TRY_MATRIX("fm22", glUniformMatrix2dv, double_junk); > + TRY_MATRIX("fm23", glUniformMatrix2x3dv, double_junk); > + TRY_MATRIX("fm24", glUniformMatrix2x4dv, double_junk); > + TRY_MATRIX("fm32", glUniformMatrix3x2dv, double_junk); > + TRY_MATRIX("fm33", glUniformMatrix3dv, double_junk); > + TRY_MATRIX("fm34", glUniformMatrix3x4dv, double_junk); > + TRY_MATRIX("fm42", glUniformMatrix4x2dv, double_junk); > + TRY_MATRIX("fm43", glUniformMatrix4x3dv, double_junk); > + TRY_MATRIX("fm44", glUniformMatrix4dv, double_junk); > + > + TRY_UNIFORM("d1", glUniform1fv, float_junk); > + TRY_UNIFORM("d2", glUniform2fv, float_junk); > + TRY_UNIFORM("d3", glUniform3fv, float_junk); > + TRY_UNIFORM("d4", glUniform4fv, float_junk); > + > + TRY_MATRIX("dm22", glUniformMatrix2fv, float_junk); > + TRY_MATRIX("dm23", glUniformMatrix2x3fv, float_junk); > + TRY_MATRIX("dm24", glUniformMatrix2x4fv, float_junk); > + TRY_MATRIX("dm32", glUniformMatrix3x2fv, float_junk); > + TRY_MATRIX("dm33", glUniformMatrix3fv, float_junk); > + TRY_MATRIX("dm34", glUniformMatrix3x4fv, float_junk); > + TRY_MATRIX("dm42", glUniformMatrix4x2fv, float_junk); > + TRY_MATRIX("dm43", glUniformMatrix4x3fv, float_junk); > + TRY_MATRIX("dm44", glUniformMatrix4fv, float_junk); > + > + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); > +} > + > +enum piglit_result > +piglit_display(void) > +{ > + return PIGLIT_FAIL; > +} > -- > 2.1.0 > > _______________________________________________ > Piglit mailing list > Piglit@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/piglit _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit