summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-06-29 10:54:07 -0600
committerBrian Paul <brianp@vmware.com>2012-07-31 12:46:44 -0600
commitf4502735ae01d6beea0b858770720b4f5f0d8fe5 (patch)
tree4443743c46830037cc7bbceefb45acfdba8d707e
parenteca893d6b991c83280365dcd36e126337c835611 (diff)
remove glsl-fs-sqrt-zero test
This was only testing compile-time evaluation of sqrt(0). It's more interesting to do render-time testing, which is done in other tests. Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--tests/all.tests1
-rw-r--r--tests/shaders/CMakeLists.gl.txt1
-rw-r--r--tests/shaders/glsl-fs-sqrt-zero.c80
-rw-r--r--tests/shaders/glsl-fs-sqrt-zero.frag4
4 files changed, 0 insertions, 86 deletions
diff --git a/tests/all.tests b/tests/all.tests
index a1a93d791..725feb09f 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -471,7 +471,6 @@ add_plain_test(shaders, 'glsl-fs-raytrace-bug27060')
add_plain_test(shaders, 'glsl-fs-sampler-numbering')
add_plain_test(shaders, 'glsl-fs-shader-stencil-export')
add_plain_test(shaders, 'glsl-fs-sqrt-branch')
-add_plain_test(shaders, 'glsl-fs-sqrt-zero')
shaders['glsl-fs-texturecube'] = PlainExecTest(['glsl-fs-texturecube',
'-auto'])
shaders['glsl-fs-texturecube-bias'] = PlainExecTest(['glsl-fs-texturecube',
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 596f5238c..f89ef80a6 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -84,7 +84,6 @@ ENDIF (NOT MSVC)
piglit_add_executable (glsl-fs-sampler-numbering glsl-fs-sampler-numbering.c)
piglit_add_executable (glsl-fs-shader-stencil-export glsl-fs-shader-stencil-export.c)
piglit_add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c)
-piglit_add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c)
piglit_add_executable (glsl-fs-texturecube glsl-fs-texturecube.c)
piglit_add_executable (glsl-fs-texturecube-2 glsl-fs-texturecube-2.c)
piglit_add_executable (glsl-fs-textureenvcolor-statechange glsl-fs-textureenvcolor-statechange.c)
diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c
deleted file mode 100644
index 84e4186b7..000000000
--- a/tests/shaders/glsl-fs-sqrt-zero.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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-vs-sqrt-zero.c
- *
- * Tests that sqrt(0.0) in the FS produces 0.0.
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_MAIN(
- 100 /*window_width*/,
- 100 /*window_height*/,
- GLUT_RGB | GLUT_DOUBLE)
-
-static GLint prog;
-
-enum piglit_result
-piglit_display(void)
-{
- GLboolean pass = GL_TRUE;
- float color[4] = {0.75, 0.75, 0.75, 0.75};
-
- glClearColor(0.5, 0.5, 0.5, 0.5);
- glClear(GL_COLOR_BUFFER_BIT);
-
- piglit_draw_rect(10, 10, 10, 10);
-
- pass &= piglit_probe_pixel_rgb(15, 15, color);
-
- glutSwapBuffers();
-
- return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- GLint vs, fs;
-
- if (piglit_get_gl_version() < 20) {
- 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-zero.frag");
-
- prog = piglit_link_simple_program(vs, fs);
-
- glUseProgram(prog);
-}
diff --git a/tests/shaders/glsl-fs-sqrt-zero.frag b/tests/shaders/glsl-fs-sqrt-zero.frag
deleted file mode 100644
index 29c2ca0f8..000000000
--- a/tests/shaders/glsl-fs-sqrt-zero.frag
+++ /dev/null
@@ -1,4 +0,0 @@
-void main()
-{
- gl_FragColor = vec4(sqrt(0.0) + 0.75);
-}