This is pretty trivial, but it's useful for debugging a Mesa display list optimization. --- tests/all.tests | 1 + tests/spec/gl-1.0/CMakeLists.gl.txt | 1 + tests/spec/gl-1.0/dlist-shademodel.c | 101 ++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 tests/spec/gl-1.0/dlist-shademodel.c
diff --git a/tests/all.tests b/tests/all.tests index 7e5bd03..0c13e65 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -570,6 +570,7 @@ add_concurrent_test(gl11, 'getteximage-targets 2D') gl10 = Group() spec['!OpenGL 1.0'] = gl10 add_concurrent_test(gl10, 'gl-1.0-beginend-coverage') +add_concurrent_test(gl10, 'gl-1.0-dlist-shademodel') add_concurrent_test(gl10, 'gl-1.0-edgeflag') add_concurrent_test(gl10, 'gl-1.0-edgeflag-quads') diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt b/tests/spec/gl-1.0/CMakeLists.gl.txt index 2f819fa..559fabc 100644 --- a/tests/spec/gl-1.0/CMakeLists.gl.txt +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt @@ -12,5 +12,6 @@ link_libraries ( piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c) piglit_add_executable (gl-1.0-edgeflag edgeflag.c) piglit_add_executable (gl-1.0-edgeflag-quads edgeflag-quads.c) +piglit_add_executable (gl-1.0-dlist-shademodel dlist-shademodel.c) # vim: ft=cmake: diff --git a/tests/spec/gl-1.0/dlist-shademodel.c b/tests/spec/gl-1.0/dlist-shademodel.c new file mode 100644 index 0000000..0b7752e --- /dev/null +++ b/tests/spec/gl-1.0/dlist-shademodel.c @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2013 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 glShadeModel in a display list. + * This is pretty trivial and shouldn't fail with any decent OpenGL, + * but it's useful for checking an optimization in Mesa's display list + * compiler. + */ + +#include "piglit-util-gl-common.h" + + +PIGLIT_GL_TEST_CONFIG_BEGIN + config.supports_gl_compat_version = 10; + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; +PIGLIT_GL_TEST_CONFIG_END + + +static const GLfloat red[] = {1.0, 0.0, 0.0}; +static const GLfloat green[] = {0.0, 1.0, 0.0}; + + +enum piglit_result +piglit_display(void) +{ + GLuint list; + bool pass; + + list = glGenLists(1); + glNewList(list, GL_COMPILE); + glShadeModel(GL_FLAT); + + glBegin(GL_QUADS); + glColor3fv(red); + glVertex2f(-1, -1); + glColor3fv(green); + glVertex2f( 0, -1); + glColor3fv(red); + glVertex2f( 0, 1); + glColor3fv(green); + glVertex2f(-1, 1); + glEnd(); + + /* Mesa should be able to optimize this away so that + * the two GL_QUADS primitives get combined into one batch. + */ + glShadeModel(GL_FLAT); + + glBegin(GL_QUADS); + glColor3fv(red); + glVertex2f(0, -1); + glColor3fv(green); + glVertex2f(1, -1); + glColor3fv(red); + glVertex2f(1, 1); + glColor3fv(green); + glVertex2f(0, 1); + glEnd(); + + glEndList(); + + glShadeModel(GL_SMOOTH); + glClear(GL_COLOR_BUFFER_BIT); + glCallList(list); + + glDeleteLists(list, 1); + + pass = piglit_probe_pixel_rgb(20, 20, green); + + piglit_present_results(); + + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} + + +void +piglit_init(int argc, char **argv) +{ + /* nothing */ +} -- 1.7.3.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit