---
tests/all.tests | 1 +
tests/shaders/CMakeLists.txt | 1 +
tests/shaders/glsl-useprogram-displaylist.c | 156 +++++++++++++++++++++++++++
3 files changed, 158 insertions(+), 0 deletions(-)
create mode 100644 tests/shaders/glsl-useprogram-displaylist.c
diff --git a/tests/all.tests b/tests/all.tests
index 82c75e3..3990fad 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -139,6 +139,7 @@ shaders['glsl-fwidth'] = PlainExecTest([testBinDir +
'glsl-fwidth', '-auto'])
shaders['glsl-lod-bias'] = PlainExecTest([testBinDir + 'glsl-lod-bias',
'-auto'])
shaders['vp-ignore-input'] = PlainExecTest([testBinDir + 'vp-ignore-input',
'-auto'])
shaders['glsl-empty-vs-no-fs'] = PlainExecTest([testBinDir +
'glsl-empty-vs-no-fs', '-auto'])
+shaders['glsl-useprogram-displaylist'] = PlainExecTest([testBinDir +
'glsl-useprogram-displaylist', '-auto'])
fpgeneric = Group()
def make_fpgeneric(name):
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index 6883484..3bb963a 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -67,3 +67,4 @@ add_executable (glsl-lod-bias glsl-lod-bias.c)
add_executable (glsl-preprocessor-comments glsl-preprocessor-comments.c)
add_executable (vp-ignore-input vp-ignore-input.c)
add_executable (glsl-empty-vs-no-fs glsl-empty-vs-no-fs.c)
+add_executable (glsl-useprogram-displaylist glsl-useprogram-displaylist.c)
diff --git a/tests/shaders/glsl-useprogram-displaylist.c
b/tests/shaders/glsl-useprogram-displaylist.c
new file mode 100644
index 0000000..cd876a0
--- /dev/null
+++ b/tests/shaders/glsl-useprogram-displaylist.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright © 2009 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.
+ *
+ * Authors:
+ * Ben Holmes <shran...@hotmail.com>
+ */
+
+/*
+ * tests for bug fdo 23746. The bug prevents glUseProgram from working when
+ * called within a display list.
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 400, piglit_height = 300;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+
+static GLuint tex[3];
+static GLint progr;
+static GLint progg;
+static GLint fsr;
+static GLint fsg;
+static GLint vs;
+static GLuint list;
+
+static GLfloat vertices[12] = {150.0, 125.0, 0.0,
+ 150.0, 175.0, 0.0,
+ 100.0, 125.0, 0.0,
+ 100.0, 175.0, 0.0};
+
+static const char *vertShaderText =
+ "void main()\n"
+ "{ \n"
+ " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+ "} \n";
+
+static const char *fragShaderTextRed =
+ "void main()\n"
+ "{ \n"
+ " gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n"
+ "} \n";
+
+static const char *fragShaderTextGreen =
+ "void main()\n"
+ "{ \n"
+ " gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);\n"
+ "} \n";
+
+static void
+compileLinkProg(void)
+{
+ GLint stat;
+
+ vs = glCreateShader(GL_VERTEX_SHADER);
+ fsr = glCreateShader(GL_FRAGMENT_SHADER);
+ fsg = glCreateShader(GL_FRAGMENT_SHADER);
+ glShaderSource(vs, 1, (const GLchar **) &vertShaderText, NULL);
+ glShaderSource(fsr, 1, (const GLchar **) &fragShaderTextRed, NULL);
+ glShaderSource(fsg, 1, (const GLchar **) &fragShaderTextGreen, NULL);
+ glCompileShader(vs);
+ glGetShaderiv(vs, GL_COMPILE_STATUS, &stat);
+ if (!stat) {
+ printf("error compiling vertex shader!\n");
+ exit(1);
+ }
+ glCompileShader(fsr);
+ glGetShaderiv(fsr, GL_COMPILE_STATUS, &stat);
+ if (!stat) {
+ printf("error compiling fragment red shader!\n");
+ exit(1);
+ }
+
+ glCompileShader(fsg);
+ glGetShaderiv(fsg, GL_COMPILE_STATUS, &stat);
+ if(!stat) {
+ printf("error compiling fragment green shader!\n");
+ exit(1);
+ }
+
+ progr = glCreateProgram();
+ glAttachShader(progr, vs);
+ glAttachShader(progr, fsr);
+ glLinkProgram(progr);
+
+ progg = glCreateProgram();
+ glAttachShader(progg, vs);
+ glAttachShader(progg, fsg);
+ glLinkProgram(progg);
+
+
+ glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3*sizeof(GLfloat),
+ vertices);
+
+ glEnableVertexAttribArray(0);
+
+ list = glGenLists(1);
+ glNewList(list, GL_COMPILE);
+ glUseProgram(progg);
+ glEndList();
+
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ if (!GLEW_VERSION_2_0) {
+ printf("Requires OpenGL 2.0\n");
+ piglit_report_result(PIGLIT_SKIP);
+ }
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+
+ glClearColor(0.2, 0.2, 0.2, 1.0);
+
+ compileLinkProg();
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ GLfloat green[3] = {0.0, 1.0, 0.0};
+ GLboolean pass = GL_TRUE;
+
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ glUseProgram(progr);
+ glCallList(list);
+
+ glDrawArrays(GL_TRIANGLE_STRIP,0,4);
+
+ pass = piglit_probe_pixel_rgb(125, 150, green);
+
+ glFinish();
+ glutSwapBuffers();
+
+ return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+}
--
1.6.3.3
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
