[Piglit] [PATCH 2/4] remove glsl-vs-sqrt-zero test

Brian Paul brianp at vmware.com
Fri Jul 20 11:33:41 PDT 2012


Will be replaced by new shader runner tests.
---
 tests/all.tests                      |    1 -
 tests/shaders/CMakeLists.gl.txt      |    1 -
 tests/shaders/glsl-vs-sqrt-zero.c    |   80 ----------------------------------
 tests/shaders/glsl-vs-sqrt-zero.vert |    6 ---
 4 files changed, 0 insertions(+), 88 deletions(-)
 delete mode 100644 tests/shaders/glsl-vs-sqrt-zero.c
 delete mode 100644 tests/shaders/glsl-vs-sqrt-zero.vert

diff --git a/tests/all.tests b/tests/all.tests
index 59c734a..5303272 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -502,7 +502,6 @@ add_plain_test(shaders, 'glsl-vs-loop-nested')
 add_plain_test(shaders, 'glsl-vs-mov-after-deref')
 add_plain_test(shaders, 'glsl-vs-mvp-statechange')
 add_plain_test(shaders, 'glsl-vs-raytrace-bug26691')
-add_plain_test(shaders, 'glsl-vs-sqrt-zero')
 add_plain_test(shaders, 'glsl-vs-statechange-1')
 add_plain_test(shaders, 'vp-address-01')
 add_plain_test(shaders, 'vp-address-02')
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index f89ef80..6ac0230 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -103,7 +103,6 @@ piglit_add_executable (glsl-vs-loop-nested glsl-vs-loop-nested.c)
 IF (NOT MSVC)
 	piglit_add_executable (glsl-vs-raytrace-bug26691 glsl-vs-raytrace-bug26691.c)
 ENDIF (NOT MSVC)
-piglit_add_executable (glsl-vs-sqrt-zero glsl-vs-sqrt-zero.c)
 piglit_add_executable (glsl-vs-statechange-1 glsl-vs-statechange-1.c)
 piglit_add_executable (glsl-vs-user-varying-ff glsl-vs-user-varying-ff.c)
 piglit_add_executable (glsl-light-model glsl-light-model.c)
diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c
deleted file mode 100644
index 531cb88..0000000
--- a/tests/shaders/glsl-vs-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 at anholt.net>
- *
- */
-
-/** @file glsl-vs-sqrt-zero.c
- *
- * Tests that sqrt(0.0) in the VS 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_rect_rgb(10, 10, 10, 10, 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-vs-sqrt-zero.vert");
-	fs = piglit_compile_shader(GL_FRAGMENT_SHADER,
-				   "shaders/glsl-color.frag");
-
-	prog = piglit_link_simple_program(vs, fs);
-
-	glUseProgram(prog);
-}
diff --git a/tests/shaders/glsl-vs-sqrt-zero.vert b/tests/shaders/glsl-vs-sqrt-zero.vert
deleted file mode 100644
index e2c0c1b..0000000
--- a/tests/shaders/glsl-vs-sqrt-zero.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-void main()
-{
-	gl_FrontColor = vec4(sqrt(0.0) + 0.75);
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-}
-
-- 
1.7.3.4



More information about the Piglit mailing list