Re: [Piglit] [PATCH] gl-1.0: Bitmap test that draws zelda hearts.
On Fri, 2018-05-11 at 13:38 -0700, Laura Ekstrand wrote: > --- > tests/opengl.py| 1 + > tests/spec/gl-1.0/CMakeLists.gl.txt| 1 + > tests/spec/gl-1.0/bitmap-heart-dance.c | 219 > + > 3 files changed, 221 insertions(+) > create mode 100644 tests/spec/gl-1.0/bitmap-heart-dance.c > > diff --git a/tests/opengl.py b/tests/opengl.py > index 347e8c5d4..ddf07b0b7 100644 > --- a/tests/opengl.py > +++ b/tests/opengl.py > @@ -570,6 +570,7 @@ with profile.test_list.group_manager( > PiglitGLTest, > grouptools.join('spec', '!opengl 1.0')) as g: > g(['gl-1.0-beginend-coverage']) > +g(['gl-1.0-bitmap-heart-dance']) > g(['gl-1.0-dlist-beginend']) > g(['gl-1.0-dlist-bitmap']) > g(['gl-1.0-dlist-materials']) > diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt b/tests/spec/gl- > 1.0/CMakeLists.gl.txt > index e5986968c..c97a160fc 100644 > --- a/tests/spec/gl-1.0/CMakeLists.gl.txt > +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt > @@ -10,6 +10,7 @@ link_libraries ( > > piglit_add_executable (gl-1.0-user-clip-all-planes user-clip-all- > planes.c) > piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c) > +piglit_add_executable (gl-1.0-bitmap-heart-dance bitmap-heart- > dance.c) > piglit_add_executable (gl-1.0-blend-func blend.c) > piglit_add_executable (gl-1.0-dlist-beginend dlist-beginend.c) > piglit_add_executable (gl-1.0-dlist-bitmap dlist-bitmap.c) > diff --git a/tests/spec/gl-1.0/bitmap-heart-dance.c b/tests/spec/gl- > 1.0/bitmap-heart-dance.c > new file mode 100644 > index 0..cb1c7faa7 > --- /dev/null > +++ b/tests/spec/gl-1.0/bitmap-heart-dance.c > @@ -0,0 +1,219 @@ > +/* > + * Copyright (C) 2018 Laura Ekstrand > + * > + * 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. > + */ > + > +/** > + * Test glBitmap in a methodical way using a series of heart shapes. > + * Heart shape is diagram A.2 from Garnstudio free sock pattern > Heart Dance > + * (https://www.garnstudio.com/pattern.php?id=7440=17). > + * Knitting color work is basically glBitmap for knits! > + * > + * _ * _ _ _ * _ _where _ = 0 > + * * * * _ * * * _ * = 1 > + * * * * * * * * _ > + * * * * * * * * _ > + * _ * * * * * _ _ > + * _ _ * * * _ _ _ > + * _ _ _ * _ _ _ _ > + * _ _ _ _ _ _ _ _ > + * > + * Or: Little endBig end > + * 0 1 0 0 0 1 0 0 68 0x44 0x22 > + * 1 1 1 0 1 1 1 0238 0xEE 0x77 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 0 1 1 1 1 1 0 0124 0x7C 0xE3 > + * 0 0 1 1 1 0 0 0 56 0x38 0xC2 > + * 0 0 0 1 0 0 0 0 16 0x10 0x80 > + * 0 0 0 0 0 0 0 0 0 0x00 0x00 > + * > + * Laura Ekstrand > + * March 2018 > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 10; > + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | > +PIGLIT_GL_VISUAL_RGBA; > + config.window_width = 340; > + config.window_height = 200; > + config.khr_no_error_support = PIGLIT_NO_ERRORS; > +PIGLIT_GL_TEST_CONFIG_END > + > +static const float red[4] = {0.502, 0.082, 0.082, 1.0}; > +static const float salmon[4] = {1.000, 0.353, 0.353, 1.0}; > +static const float pink[4] = {0.945, 0.471, 0.639, 1.0}; > +static const float orange[4] = {1.000, 0.286, 0.000, 1.0}; > +static const float ltorange[4] = {1.000, 0.514, 0.322, 1.0}; > +static const float yellow[4] = {1.000, 0.871, 0.133, 1.0}; > +static GLubyte bitmap[8] = { 0x00, 0x10, 0x38, 0x7C, > + 0xFE, 0xFE, 0xEE, 0x44 }; > + > +static const char *fragShaderText = > +
Re: [Piglit] [PATCH] gl-1.0: Bitmap test that draws zelda hearts.
Sorry for the lag... this hit the list while I was on vacation, and I just forgot to check back. Reviewed-by: Ian Romanick On 05/11/2018 01:38 PM, Laura Ekstrand wrote: > --- > tests/opengl.py| 1 + > tests/spec/gl-1.0/CMakeLists.gl.txt| 1 + > tests/spec/gl-1.0/bitmap-heart-dance.c | 219 > + > 3 files changed, 221 insertions(+) > create mode 100644 tests/spec/gl-1.0/bitmap-heart-dance.c > > diff --git a/tests/opengl.py b/tests/opengl.py > index 347e8c5d4..ddf07b0b7 100644 > --- a/tests/opengl.py > +++ b/tests/opengl.py > @@ -570,6 +570,7 @@ with profile.test_list.group_manager( > PiglitGLTest, > grouptools.join('spec', '!opengl 1.0')) as g: > g(['gl-1.0-beginend-coverage']) > +g(['gl-1.0-bitmap-heart-dance']) > g(['gl-1.0-dlist-beginend']) > g(['gl-1.0-dlist-bitmap']) > g(['gl-1.0-dlist-materials']) > diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt > b/tests/spec/gl-1.0/CMakeLists.gl.txt > index e5986968c..c97a160fc 100644 > --- a/tests/spec/gl-1.0/CMakeLists.gl.txt > +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt > @@ -10,6 +10,7 @@ link_libraries ( > > piglit_add_executable (gl-1.0-user-clip-all-planes user-clip-all-planes.c) > piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c) > +piglit_add_executable (gl-1.0-bitmap-heart-dance bitmap-heart-dance.c) > piglit_add_executable (gl-1.0-blend-func blend.c) > piglit_add_executable (gl-1.0-dlist-beginend dlist-beginend.c) > piglit_add_executable (gl-1.0-dlist-bitmap dlist-bitmap.c) > diff --git a/tests/spec/gl-1.0/bitmap-heart-dance.c > b/tests/spec/gl-1.0/bitmap-heart-dance.c > new file mode 100644 > index 0..cb1c7faa7 > --- /dev/null > +++ b/tests/spec/gl-1.0/bitmap-heart-dance.c > @@ -0,0 +1,219 @@ > +/* > + * Copyright (C) 2018 Laura Ekstrand > + * > + * 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. > + */ > + > +/** > + * Test glBitmap in a methodical way using a series of heart shapes. > + * Heart shape is diagram A.2 from Garnstudio free sock pattern Heart Dance > + * (https://www.garnstudio.com/pattern.php?id=7440=17). > + * Knitting color work is basically glBitmap for knits! > + * > + * _ * _ _ _ * _ _where _ = 0 > + * * * * _ * * * _ * = 1 > + * * * * * * * * _ > + * * * * * * * * _ > + * _ * * * * * _ _ > + * _ _ * * * _ _ _ > + * _ _ _ * _ _ _ _ > + * _ _ _ _ _ _ _ _ > + * > + * Or: Little endBig end > + * 0 1 0 0 0 1 0 0 68 0x44 0x22 > + * 1 1 1 0 1 1 1 0238 0xEE 0x77 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 0 1 1 1 1 1 0 0124 0x7C 0xE3 > + * 0 0 1 1 1 0 0 0 56 0x38 0xC2 > + * 0 0 0 1 0 0 0 0 16 0x10 0x80 > + * 0 0 0 0 0 0 0 0 0 0x00 0x00 > + * > + * Laura Ekstrand > + * March 2018 > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 10; > + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | > +PIGLIT_GL_VISUAL_RGBA; > + config.window_width = 340; > + config.window_height = 200; > + config.khr_no_error_support = PIGLIT_NO_ERRORS; > +PIGLIT_GL_TEST_CONFIG_END > + > +static const float red[4] = {0.502, 0.082, 0.082, 1.0}; > +static const float salmon[4] = {1.000, 0.353, 0.353, 1.0}; > +static const float pink[4] = {0.945, 0.471, 0.639, 1.0}; > +static const float orange[4] = {1.000, 0.286, 0.000, 1.0}; > +static const float ltorange[4] = {1.000, 0.514, 0.322, 1.0}; > +static const float yellow[4] = {1.000, 0.871, 0.133, 1.0}; > +static GLubyte bitmap[8] = { 0x00, 0x10, 0x38, 0x7C, > +
Re: [Piglit] [PATCH] gl-1.0: Bitmap test that draws zelda hearts.
Ian, This test has been moved up the priority list. Jason has adopted my blitter-removal patches because someone at Intel wants the blitter gone. (It should've been deleted ages ago.) Anyway, test coverage for glBitmap was a little spotty for the purposes of removing the blitter from glBitmap in the i965 driver, so that's why I made this test. Thanks. Laura On Fri, May 11, 2018 at 1:38 PM, Laura Ekstrandwrote: > --- > tests/opengl.py| 1 + > tests/spec/gl-1.0/CMakeLists.gl.txt| 1 + > tests/spec/gl-1.0/bitmap-heart-dance.c | 219 > + > 3 files changed, 221 insertions(+) > create mode 100644 tests/spec/gl-1.0/bitmap-heart-dance.c > > diff --git a/tests/opengl.py b/tests/opengl.py > index 347e8c5d4..ddf07b0b7 100644 > --- a/tests/opengl.py > +++ b/tests/opengl.py > @@ -570,6 +570,7 @@ with profile.test_list.group_manager( > PiglitGLTest, > grouptools.join('spec', '!opengl 1.0')) as g: > g(['gl-1.0-beginend-coverage']) > +g(['gl-1.0-bitmap-heart-dance']) > g(['gl-1.0-dlist-beginend']) > g(['gl-1.0-dlist-bitmap']) > g(['gl-1.0-dlist-materials']) > diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt b/tests/spec/gl-1.0/ > CMakeLists.gl.txt > index e5986968c..c97a160fc 100644 > --- a/tests/spec/gl-1.0/CMakeLists.gl.txt > +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt > @@ -10,6 +10,7 @@ link_libraries ( > > piglit_add_executable (gl-1.0-user-clip-all-planes user-clip-all-planes.c) > piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c) > +piglit_add_executable (gl-1.0-bitmap-heart-dance bitmap-heart-dance.c) > piglit_add_executable (gl-1.0-blend-func blend.c) > piglit_add_executable (gl-1.0-dlist-beginend dlist-beginend.c) > piglit_add_executable (gl-1.0-dlist-bitmap dlist-bitmap.c) > diff --git a/tests/spec/gl-1.0/bitmap-heart-dance.c > b/tests/spec/gl-1.0/bitmap-heart-dance.c > new file mode 100644 > index 0..cb1c7faa7 > --- /dev/null > +++ b/tests/spec/gl-1.0/bitmap-heart-dance.c > @@ -0,0 +1,219 @@ > +/* > + * Copyright (C) 2018 Laura Ekstrand > + * > + * 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. > + */ > + > +/** > + * Test glBitmap in a methodical way using a series of heart shapes. > + * Heart shape is diagram A.2 from Garnstudio free sock pattern Heart > Dance > + * (https://www.garnstudio.com/pattern.php?id=7440=17). > + * Knitting color work is basically glBitmap for knits! > + * > + * _ * _ _ _ * _ _where _ = 0 > + * * * * _ * * * _ * = 1 > + * * * * * * * * _ > + * * * * * * * * _ > + * _ * * * * * _ _ > + * _ _ * * * _ _ _ > + * _ _ _ * _ _ _ _ > + * _ _ _ _ _ _ _ _ > + * > + * Or: Little endBig end > + * 0 1 0 0 0 1 0 0 68 0x44 0x22 > + * 1 1 1 0 1 1 1 0238 0xEE 0x77 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 0 1 1 1 1 1 0 0124 0x7C 0xE3 > + * 0 0 1 1 1 0 0 0 56 0x38 0xC2 > + * 0 0 0 1 0 0 0 0 16 0x10 0x80 > + * 0 0 0 0 0 0 0 0 0 0x00 0x00 > + * > + * Laura Ekstrand > + * March 2018 > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 10; > + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | > + PIGLIT_GL_VISUAL_RGBA; > + config.window_width = 340; > + config.window_height = 200; > + config.khr_no_error_support = PIGLIT_NO_ERRORS; > +PIGLIT_GL_TEST_CONFIG_END > + > +static const float red[4] = {0.502, 0.082, 0.082, 1.0}; > +static const float salmon[4] = {1.000, 0.353, 0.353, 1.0}; > +static const float pink[4]
Re: [Piglit] [PATCH] gl-1.0: Bitmap test that draws zelda hearts.
On 04/23/2018 12:16 PM, Laura Ekstrand wrote: > Only tested on Broadwell gt2. > --- > tests/all.py | 1 + > tests/spec/gl-1.0/CMakeLists.gl.txt| 1 + > tests/spec/gl-1.0/bitmap-heart-dance.c | 215 > + > 3 files changed, 217 insertions(+) > create mode 100644 tests/spec/gl-1.0/bitmap-heart-dance.c > > diff --git a/tests/all.py b/tests/all.py > index 26638cd82..616ce68f5 100644 > --- a/tests/all.py > +++ b/tests/all.py > @@ -722,6 +722,7 @@ with profile.test_list.group_manager( > PiglitGLTest, > grouptools.join('spec', '!opengl 1.0')) as g: > g(['gl-1.0-beginend-coverage']) > +g(['gl-1.0-bitmap-heart-dance']) > g(['gl-1.0-dlist-beginend']) > g(['gl-1.0-dlist-bitmap']) > g(['gl-1.0-dlist-materials']) > diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt > b/tests/spec/gl-1.0/CMakeLists.gl.txt > index e5986968c..c97a160fc 100644 > --- a/tests/spec/gl-1.0/CMakeLists.gl.txt > +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt > @@ -10,6 +10,7 @@ link_libraries ( > > piglit_add_executable (gl-1.0-user-clip-all-planes user-clip-all-planes.c) > piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c) > +piglit_add_executable (gl-1.0-bitmap-heart-dance bitmap-heart-dance.c) > piglit_add_executable (gl-1.0-blend-func blend.c) > piglit_add_executable (gl-1.0-dlist-beginend dlist-beginend.c) > piglit_add_executable (gl-1.0-dlist-bitmap dlist-bitmap.c) > diff --git a/tests/spec/gl-1.0/bitmap-heart-dance.c > b/tests/spec/gl-1.0/bitmap-heart-dance.c > new file mode 100644 > index 0..a3a4ac708 > --- /dev/null > +++ b/tests/spec/gl-1.0/bitmap-heart-dance.c > @@ -0,0 +1,215 @@ > +/* > + * Copyright (C) 2018 Laura Ekstrand > + * > + * 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. > + */ > + > +/** > + * Test glBitmap in a methodical way using a series of heart shapes. > + * Heart shape is diagram A.2 from Garnstudio free sock pattern Heart Dance > + * (https://www.garnstudio.com/pattern.php?id=7440=17). > + * Knitting color work is basically glBitmap for knits! > + * > + * _ * _ _ _ * _ _where _ = 0 > + * * * * _ * * * _ * = 1 > + * * * * * * * * _ > + * * * * * * * * _ > + * _ * * * * * _ _ > + * _ _ * * * _ _ _ > + * _ _ _ * _ _ _ _ > + * _ _ _ _ _ _ _ _ > + * > + * Or: Little endBig end > + * 0 1 0 0 0 1 0 0 68 0x44 0x22 > + * 1 1 1 0 1 1 1 0238 0xEE 0x77 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 1 1 1 1 1 1 1 0254 0xFE 0xF7 > + * 0 1 1 1 1 1 0 0124 0x7C 0xE3 > + * 0 0 1 1 1 0 0 0 56 0x38 0xC2 > + * 0 0 0 1 0 0 0 0 16 0x10 0x80 > + * 0 0 0 0 0 0 0 0 0 0x00 0x00 > + * > + * Laura Ekstrand > + * March 2018 > + */ > + > +#include "piglit-util-gl.h" > + > +PIGLIT_GL_TEST_CONFIG_BEGIN > + config.supports_gl_compat_version = 10; > + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; > + config.window_width = 340; > + config.window_height = 200; > + config.khr_no_error_support = PIGLIT_NO_ERRORS; > +PIGLIT_GL_TEST_CONFIG_END > + > +static const float red[4] = {0.502, 0.082, 0.082, 1.0}; > +static const float salmon[4] = {1.000, 0.353, 0.353, 1.0}; > +static const float pink[4] = {0.945, 0.471, 0.639, 1.0}; > +static const float orange[4] = {1.000, 0.286, 0.000, 1.0}; > +static const float ltorange[4] = {1.000, 0.514, 0.322, 1.0}; > +static const float yellow[4] = {1.000, 0.871, 0.133, 1.0}; > +static GLubyte bitmap[8] = { 0x00, 0x10, 0x38, 0x7C, > + 0xFE, 0xFE, 0xEE, 0x44 }; > + > +static const char *fragShaderText = > + "#version 130 \n" > + "uniform vec4 red; \n" > + "uniform