[Piglit] [PATCH 3/3] gl-1.0-dlist-materials: new test of materials in display lists
This exercises two code paths in Mesa's display list VBO code.
---
tests/all.py| 1 +
tests/spec/gl-1.0/CMakeLists.gl.txt | 1 +
tests/spec/gl-1.0/dlist-materials.c | 164
3 files changed, 166 insertions(+)
create mode 100644 tests/spec/gl-1.0/dlist-materials.c
diff --git a/tests/all.py b/tests/all.py
index eb496a6..ef8c01b 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -717,6 +717,7 @@ with profile.test_list.group_manager(
g(['gl-1.0-beginend-coverage'])
g(['gl-1.0-dlist-beginend'])
g(['gl-1.0-dlist-bitmap'])
+g(['gl-1.0-dlist-materials'])
g(['gl-1.0-dlist-shademodel'])
g(['gl-1.0-drawpixels-color-index'])
g(['gl-1.0-drawpixels-depth-test'])
diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt
b/tests/spec/gl-1.0/CMakeLists.gl.txt
index fcb1d1d..f1d4d93 100644
--- a/tests/spec/gl-1.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
@@ -12,6 +12,7 @@ piglit_add_executable (gl-1.0-beginend-coverage
beginend-coverage.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)
+piglit_add_executable (gl-1.0-dlist-materials dlist-materials.c)
piglit_add_executable (gl-1.0-dlist-shademodel dlist-shademodel.c)
piglit_add_executable (gl-1.0-drawbuffer-modes drawbuffer-modes.c)
piglit_add_executable (gl-1.0-drawpixels-color-index drawpixels-color-index.c)
diff --git a/tests/spec/gl-1.0/dlist-materials.c
b/tests/spec/gl-1.0/dlist-materials.c
new file mode 100644
index 000..1e61825
--- /dev/null
+++ b/tests/spec/gl-1.0/dlist-materials.c
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2018 VMware, Inc.
+ *
+ * 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 glMaterial calls in a display list.
+ */
+
+#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.khr_no_error_support = PIGLIT_NO_ERRORS;
+PIGLIT_GL_TEST_CONFIG_END
+
+
+static const GLfloat red[] = {1.0, 0.0, 0.0, 1.0};
+static const GLfloat green[] = {0.0, 1.0, 0.0, 1.0};
+static const GLfloat black[] = {0.0, 0.0, 0.0, 1.0};
+static const GLfloat white[] = {1.0, 1.0, 1.0, 1.0};
+
+
+/**
+ * Build display list to draw two quads with a triangle strip
+ * using glMaterial calls to set vertex colors.
+ * \param set_all If true, set the material attribs for all vertices.
+ * Otherwise, just set the material attribs for two
+ * provoking vertices.
+ *
+ * Note: the set_all parameter controls whether Mesa hits the "loopback" code.
+ */
+static GLuint
+make_list(GLenum mat, bool set_all)
+{
+ GLuint list;
+
+ list = glGenLists(1);
+ glNewList(list, GL_COMPILE);
+
+ /*
+* Draw tri strip drawing two quads- left=red, right=green.
+*/
+ glShadeModel(GL_FLAT);
+ glBegin(GL_TRIANGLE_STRIP);
+ glNormal3f(0, 0, 1);
+
+ /* v0 */
+ if (set_all)
+ glMaterialfv(GL_FRONT_AND_BACK, mat, red);
+ glVertex2f(-1, -1);
+
+ /* v1 */
+ if (set_all)
+ glMaterialfv(GL_FRONT_AND_BACK, mat, red);
+ glVertex2f(-1, 1);
+
+ /* v2 */
+ glMaterialfv(GL_FRONT_AND_BACK, mat, red);
+ glVertex2f( 0, -1);
+
+ /* v3 */
+ if (set_all)
+ glMaterialfv(GL_FRONT_AND_BACK, mat, red);
+ glVertex2f( 0, 1);
+
+ /* v4 */
+ glMaterialfv(GL_FRONT_AND_BACK, mat, green);
+ glVertex2f( 1, -1);
+
+ /* v5 */
+ if (set_all)
+ glMaterialfv(GL_FRONT_AND_BACK, mat, green);
+ glVertex2f( 1, 1);
+
+ glEnd();
+
+ glEndList();
+
+ return list;
+}
+
+
+static bool
+test_material(GLenum mat, bool set_all)
+{
+
Re: [Piglit] [PATCH 3/3] gl-1.0-dlist-materials: new test of materials in display lists
Am 17.01.2018 um 23:54 schrieb Brian Paul:
> This exercises two code paths in Mesa's display list VBO code.
> ---
> tests/all.py| 1 +
> tests/spec/gl-1.0/CMakeLists.gl.txt | 1 +
> tests/spec/gl-1.0/dlist-materials.c | 164
>
> 3 files changed, 166 insertions(+)
> create mode 100644 tests/spec/gl-1.0/dlist-materials.c
>
> diff --git a/tests/all.py b/tests/all.py
> index eb496a6..ef8c01b 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -717,6 +717,7 @@ with profile.test_list.group_manager(
> g(['gl-1.0-beginend-coverage'])
> g(['gl-1.0-dlist-beginend'])
> g(['gl-1.0-dlist-bitmap'])
> +g(['gl-1.0-dlist-materials'])
> g(['gl-1.0-dlist-shademodel'])
> g(['gl-1.0-drawpixels-color-index'])
> g(['gl-1.0-drawpixels-depth-test'])
> diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt
> b/tests/spec/gl-1.0/CMakeLists.gl.txt
> index fcb1d1d..f1d4d93 100644
> --- a/tests/spec/gl-1.0/CMakeLists.gl.txt
> +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
> @@ -12,6 +12,7 @@ piglit_add_executable (gl-1.0-beginend-coverage
> beginend-coverage.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)
> +piglit_add_executable (gl-1.0-dlist-materials dlist-materials.c)
> piglit_add_executable (gl-1.0-dlist-shademodel dlist-shademodel.c)
> piglit_add_executable (gl-1.0-drawbuffer-modes drawbuffer-modes.c)
> piglit_add_executable (gl-1.0-drawpixels-color-index
> drawpixels-color-index.c)
> diff --git a/tests/spec/gl-1.0/dlist-materials.c
> b/tests/spec/gl-1.0/dlist-materials.c
> new file mode 100644
> index 000..1e61825
> --- /dev/null
> +++ b/tests/spec/gl-1.0/dlist-materials.c
> @@ -0,0 +1,164 @@
> +/*
> + * Copyright (C) 2018 VMware, Inc.
> + *
> + * 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 glMaterial calls in a display list.
> + */
> +
> +#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.khr_no_error_support = PIGLIT_NO_ERRORS;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +
> +static const GLfloat red[] = {1.0, 0.0, 0.0, 1.0};
> +static const GLfloat green[] = {0.0, 1.0, 0.0, 1.0};
> +static const GLfloat black[] = {0.0, 0.0, 0.0, 1.0};
> +static const GLfloat white[] = {1.0, 1.0, 1.0, 1.0};
> +
> +
> +/**
> + * Build display list to draw two quads with a triangle strip
> + * using glMaterial calls to set vertex colors.
> + * \param set_all If true, set the material attribs for all vertices.
> + * Otherwise, just set the material attribs for two
> + * provoking vertices.
> + *
> + * Note: the set_all parameter controls whether Mesa hits the "loopback"
> code.
> + */
> +static GLuint
> +make_list(GLenum mat, bool set_all)
> +{
> + GLuint list;
> +
> + list = glGenLists(1);
> + glNewList(list, GL_COMPILE);
> +
> + /*
> + * Draw tri strip drawing two quads- left=red, right=green.
whitespace before "-" ?
Ahhh materials. Quite a blast from the past :-).
I faintly remember them causing nothing but problems for some old radeon
chips (r100, maybe r200 IIRC) - or rather the ability to being able to
change them even between begin/end...
I could certainly see tons of things going wrong with them not just
between begin/end but additionally in a display list...
Reviewed-by: Roland Scheidegger
> + */
> + glShadeModel(GL_FLAT);
> + glBegin(GL_TRIANGLE_STRIP);
> + glNormal3f(0, 0, 1);
> +
> + /* v0 */
> + if (set_all)
> + glMaterialfv(GL_FRONT_AND_BACK, mat, red);
> + glVertex2f(-1, -1);
> +
> + /* v1 */
> + if
