Am Wednesday 07 October 2009 23:31:02 schrieb Ben Holmes:
> ---
> tests/all.tests | 5 +-
> tests/bugs/CMakeLists.txt | 1 +
> tests/bugs/fdo23746.c | 193
> +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 197
> insertions(+), 2 deletions(-)
> create mode 100644 tests/bugs/fdo23746.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index da77f12..539d390 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -142,8 +142,9 @@ bugs['tex1d-2dborder'] = PlainExecTest([testBinDir +
> 'tex1d-2dborder', '-auto']) bugs['point-sprite'] =
> PlainExecTest([testBinDir + 'point-sprite', '-auto']) bugs['fdo22540'] =
> PlainExecTest([testBinDir + 'fdo22540', '-auto']) =======
> -bugs['point-sprite'] = PlainExecText([testBinDir + 'point-sprite',
> '-auto']) -bugs['fdo22540'] = PlainExecText([testBinDir + 'fdo22540',
> '-auto']) +bugs['point-sprite'] = PlainExecTest([testBinDir +
> 'point-sprite', '-auto']) +bugs['fdo22540'] = PlainExecTest([testBinDir +
> 'fdo22540', '-auto']) +bugs['fdo23746'] = PlainExecTest([testBinDir +
> 'fdo23746', '-auto'])
>
> >>>>>>> glsl-derivs:tests/all.tests
Looks like somebody incorrectly fixed a merge to tests/all.tests at some
point.
The test itself looks good to me though.
cu,
Nicolai
>
> texturing = Group()
> diff --git a/tests/bugs/CMakeLists.txt b/tests/bugs/CMakeLists.txt
> index 7cf469d..21a61be 100644
> --- a/tests/bugs/CMakeLists.txt
> +++ b/tests/bugs/CMakeLists.txt
> @@ -30,6 +30,7 @@ add_executable (tex1d-2dborder tex1d-2dborder.c)
> add_executable (fdo20701 fdo20701.c)
> add_executable (point-sprite point-sprite.c)
> add_executable (fdo22540 fdo22540.c)
> +add_executable (fdo23746 fdo23746.c)
> <<<<<<< HEAD:tests/bugs/CMakeLists.txt
> =======
>
> diff --git a/tests/bugs/fdo23746.c b/tests/bugs/fdo23746.c
> new file mode 100644
> index 0000000..35c9df4
> --- /dev/null
> +++ b/tests/bugs/fdo23746.c
> @@ -0,0 +1,193 @@
> +/*
> + * 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.
> + */
> +
> +// author: Ben Holmes
> +
> +/*
> + * tests for a bug that results in glUseProgram failing to change the
> + * program used when included in a display list.
> + */
> +
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <GL/glew.h>
> +#if defined(__APPLE__)
> +#include <GLUT/glut.h>
> +#else
> +#include <GL/glut.h>
> +#endif
> +
> +#include "piglit-util.h"
> +
> +static GLboolean Automatic = GL_FALSE;
> +static GLuint tex[3];
> +static GLint progr;
> +static GLint progg;
> +static GLint fsr;
> +static GLint fsg;
> +static GLint vs;
> +static GLuint l;
> +
> +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();
> +
> +static void
> +Init()
> +{
> +
> + glewInit();
> + glMatrixMode(GL_PROJECTION);
> + glPushMatrix();
> + glLoadIdentity();
> + glOrtho(0, 400, 0, 300, -1, 1);
> +
> + glMatrixMode(GL_MODELVIEW);
> + glPushMatrix();
> + glLoadIdentity();
> +
> + glClearColor(0.2, 0.2, 0.2, 1.0);
> +
> + compileLinkProg();
> +}
> +
> +static void
> +compileLinkProg()
> +{
> + 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);
> +
> + l = glGenLists(1);
> + glNewList(l, GL_COMPILE);
> + glUseProgram(progg);
> + glEndList();
> +
> +}
> +
> +
> +static void
> +display()
> +{
> + glClear(GL_COLOR_BUFFER_BIT);
> + glUseProgram(progr);
> + glCallList(l);
> +
> + glDrawArrays(GL_TRIANGLE_STRIP,0,4);
> +
> + GLfloat green[3] = {0.0, 1.0, 0.0};
> + GLboolean pass = GL_TRUE;
> +
> + pass = piglit_probe_pixel_rgb(125, 150, green);
> +
> + if(Automatic) {
> + piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
> + exit(pass ? 0 : 1);
> + }
> +
> + glFinish();
> + glutSwapBuffers();
> +
> +}
> +
> +int main(int argc, char **argv)
> +{
> + glutInit(&argc, argv);
> + if(argc==2 && !strncmp(argv[1], "-auto", 5))
> + Automatic=GL_TRUE;
> + glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
> + glutInitWindowSize(400, 300);
> + glutCreateWindow("fdo23746");
> + glutDisplayFunc(display);
> + glutKeyboardFunc(piglit_escape_exit_key);
> +
> + Init();
> +
> + glutMainLoop();
> +
> + return 0;
> +}
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
