diff options
author | Eric Anholt <eric@anholt.net> | 2010-03-10 11:05:16 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-03-10 11:05:16 -0800 |
commit | ca5933607f883687484506ae4d099aed673be941 (patch) | |
tree | b42ed37ff0e60c63ed3dce631713371b04ced086 | |
parent | 06a16c5ea898bf9b2b8aaa6aab76685ce4116d23 (diff) |
glsl-fs-sqrt-branch: Add a new test for a 965 driver bug in Yo Frankie!
-rw-r--r-- | tests/all.tests | 1 | ||||
-rw-r--r-- | tests/shaders/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/shaders/glsl-fs-sqrt-branch.c | 87 | ||||
-rw-r--r-- | tests/shaders/glsl-fs-sqrt-branch.frag | 9 |
4 files changed, 98 insertions, 0 deletions
diff --git a/tests/all.tests b/tests/all.tests index 50e07d511..b8d570101 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -156,6 +156,7 @@ add_plain_test(shaders, 'glsl-fs-fragcoord') add_plain_test(shaders, 'glsl-fs-log2') add_plain_test(shaders, 'glsl-fs-loop') add_plain_test(shaders, 'glsl-fs-loop-nested') +add_plain_test(shaders, 'glsl-fs-sqrt-branch') add_plain_test(shaders, 'glsl-fs-sqrt-zero') add_plain_test(shaders, 'glsl-vs-arrays') add_plain_test(shaders, 'glsl-vs-if') diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt index 5351048d9..781de3667 100644 --- a/tests/shaders/CMakeLists.txt +++ b/tests/shaders/CMakeLists.txt @@ -53,6 +53,7 @@ add_executable (glsl-fs-fragcoord glsl-fs-fragcoord.c) add_executable (glsl-fs-log2 glsl-fs-log2.c) add_executable (glsl-fs-loop glsl-fs-loop.c) add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c) +add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c) add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c) add_executable (glsl-vs-arrays glsl-vs-arrays.c) add_executable (glsl-vs-mov-after-deref glsl-vs-mov-after-deref.c) diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c new file mode 100644 index 000000000..d7b8a0a1e --- /dev/null +++ b/tests/shaders/glsl-fs-sqrt-branch.c @@ -0,0 +1,87 @@ +/* + * 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: + * Eric Anholt <eric@anholt.net> + * + */ + +/** @file glsl-fs-sqrt.c + * + * Tests that sqrt produces the expected output in a fragment shader + * containing a conditional branch. Catches a bug in the 965 driver. + */ + +#include "piglit-util.h" + +int piglit_width = 100, piglit_height = 100; +int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; + +static int args1_location, args2_location; +static GLint prog; + +enum piglit_result +piglit_display(void) +{ + GLboolean pass = GL_TRUE; + static const float args1[4] = {1.0, 0.25, -1.0, 0.0}; + static const float args2[4] = {1.0, 0.0, 0.0, 0.0}; + static const float result[] = {1.0, 0.5, 0.0, 0.0}; + + glClearColor(0.5, 0.5, 0.5, 0.5); + glClear(GL_COLOR_BUFFER_BIT); + + glUniform4fv(args1_location, 1, args1); + glUniform4fv(args2_location, 1, args2); + piglit_draw_rect(10, 10, 10, 10); + + pass &= piglit_probe_pixel_rgb(15, 15, result); + + glutSwapBuffers(); + + return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; +} + +void +piglit_init(int argc, char **argv) +{ + GLint vs, fs; + + 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); + + vs = piglit_compile_shader(GL_VERTEX_SHADER, + "shaders/glsl-mvp.vert"); + fs = piglit_compile_shader(GL_FRAGMENT_SHADER, + "shaders/glsl-fs-sqrt-branch.frag"); + + prog = piglit_link_simple_program(vs, fs); + + glUseProgram(prog); + + args1_location = glGetUniformLocation(prog, "args1"); + args2_location = glGetUniformLocation(prog, "args2"); +} diff --git a/tests/shaders/glsl-fs-sqrt-branch.frag b/tests/shaders/glsl-fs-sqrt-branch.frag new file mode 100644 index 000000000..14ab3eec2 --- /dev/null +++ b/tests/shaders/glsl-fs-sqrt-branch.frag @@ -0,0 +1,9 @@ +uniform vec4 args1, args2; + +void main() +{ + if (args2.x != 0) + gl_FragColor = sqrt(args1); + else + gl_FragColor = args2; +} |