Convert glsl-fs-mix to a shader runner test.

Shader runner tests are easier to read at a glance than C tests.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

4 files changed, 26 insertions, 99 deletions

diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 93cbf7b3..d77ae4d1 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -77,7 +77,6 @@ piglit_add_executable (glsl-fs-fragcoord-zw-ortho glsl-fs-fragcoord-zw-ortho.c)
 piglit_add_executable (glsl-fs-fragcoord-zw-perspective glsl-fs-fragcoord-zw-perspective.c)
 piglit_add_executable (glsl-fs-loop glsl-fs-loop.c)
 piglit_add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c)
-piglit_add_executable (glsl-fs-mix glsl-fs-mix.c)
 piglit_add_executable (glsl-fs-mix-constant glsl-fs-mix-constant.c)
 IF (NOT MSVC)
 	piglit_add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c)
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
deleted file mode 100644
index eb5580fb..00000000
--- a/tests/shaders/glsl-fs-mix.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2010 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-mix.c
- *
- * Tests that mix() produces the expected output in a fragment shader.
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-	config.supports_gl_compat_version = 10;
-
-	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-static int args1_location, args2_location, args3_location;
-static GLint prog;
-
-enum piglit_result
-piglit_display(void)
-{
-	GLboolean pass = GL_TRUE;
-	/* result = mix(args1, args2, args3) */
-	static const float args1[4] = {1.0, 0.0, 2.0, 0.0};
-	static const float args2[4] = {0.0, 1.0, 0.0, 2.0};
-	static const float args3[4] = {0.5, 0.5, 0.75, 0.25};
-	static const float gray[] = {0.5, 0.5, 0.5, 0.5};
-
-	glClearColor(0.0, 1.0, 0.0, 0.0);
-	glClear(GL_COLOR_BUFFER_BIT);
-
-	glUniform4fv(args1_location, 1, args1);
-	glUniform4fv(args2_location, 1, args2);
-	glUniform4fv(args3_location, 1, args3);
-	piglit_draw_rect(10, 10, 10, 10);
-
-	pass &= piglit_probe_pixel_rgba(15, 15, gray);
-
-	piglit_present_results();
-
-	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
-	GLint vs, fs;
-
-	piglit_require_gl_version(20);
-
-	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-mix.frag");
-
-	prog = piglit_link_simple_program(vs, fs);
-
-	glUseProgram(prog);
-
-	args1_location = glGetUniformLocation(prog, "args1");
-	args2_location = glGetUniformLocation(prog, "args2");
-	args3_location = glGetUniformLocation(prog, "args3");
-}
diff --git a/tests/shaders/glsl-fs-mix.frag b/tests/shaders/glsl-fs-mix.frag
deleted file mode 100644
index 90f359f7..00000000
--- a/tests/shaders/glsl-fs-mix.frag
+++ /dev/null
@@ -1,6 +0,0 @@
-uniform vec4 args1, args2, args3;
-
-void main()
-{
-	gl_FragColor = mix(args1, args2, args3);
-}
diff --git a/tests/shaders/glsl-fs-mix.shader_test b/tests/shaders/glsl-fs-mix.shader_test
new file mode 100644
index 00000000..787af116
--- /dev/null
+++ b/tests/shaders/glsl-fs-mix.shader_test
@@ -0,0 +1,26 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+void main()
+{
+	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+}
+
+[fragment shader]
+uniform vec4 args1, args2, args3;
+
+void main()
+{
+	gl_FragColor = mix(args1, args2, args3);
+}
+
+[test]
+clear color 0.0 1.0 0.0 0.0
+clear
+ortho
+uniform vec4 args1 1.0 0.0 2.0  0.0
+uniform vec4 args2 0.0 1.0 0.0  2.0
+uniform vec4 args3 0.5 0.5 0.75 0.25
+draw rect 10 10 10 10
+probe rgba 15 15 0.5 0.5 0.5 0.5