diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2012-12-30 14:42:22 -0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-01-03 13:40:29 -0800 |
commit | 6779b0b4a5198b4ca8a802439f8a9394c919d4fe (patch) | |
tree | a1b3492bd3d42be49b0b6c13ab3964096ce60ad4 | |
parent | 931179cd32457ce0b7a765a6bfc2329478746036 (diff) |
Convert glsl-fs-mix-constant to a shader runner test.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | tests/all.tests | 1 | ||||
-rw-r--r-- | tests/shaders/CMakeLists.gl.txt | 1 | ||||
-rw-r--r-- | tests/shaders/glsl-fs-mix-constant.c | 81 | ||||
-rw-r--r-- | tests/shaders/glsl-fs-mix-constant.frag | 7 | ||||
-rw-r--r-- | tests/shaders/glsl-fs-mix-constant.shader_test | 23 |
5 files changed, 23 insertions, 90 deletions
diff --git a/tests/all.tests b/tests/all.tests index 1db83a31..e72e164b 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -238,7 +238,6 @@ add_plain_test(shaders, 'glsl-fs-fragcoord-zw-ortho') add_plain_test(shaders, 'glsl-fs-fragcoord-zw-perspective') add_plain_test(shaders, 'glsl-fs-loop') add_plain_test(shaders, 'glsl-fs-loop-nested') -add_plain_test(shaders, 'glsl-fs-mix-constant') add_plain_test(shaders, 'glsl-fs-pointcoord') add_plain_test(shaders, 'glsl-fs-raytrace-bug27060') add_plain_test(shaders, 'glsl-fs-sampler-numbering') diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt index d77ae4d1..5de5b957 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-constant glsl-fs-mix-constant.c) IF (NOT MSVC) piglit_add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c) ENDIF (NOT MSVC) diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c deleted file mode 100644 index a2be8fd6..00000000 --- a/tests/shaders/glsl-fs-mix-constant.c +++ /dev/null @@ -1,81 +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-constant.c - * - * Tests that mix() produces the expected output in a fragment shader with - * all constant arguments. - */ - -#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 GLint prog; - -enum piglit_result -piglit_display(void) -{ - GLboolean pass = GL_TRUE; - 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); - - 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-constant.frag"); - - prog = piglit_link_simple_program(vs, fs); - - glUseProgram(prog); -} diff --git a/tests/shaders/glsl-fs-mix-constant.frag b/tests/shaders/glsl-fs-mix-constant.frag deleted file mode 100644 index adbd44a1..00000000 --- a/tests/shaders/glsl-fs-mix-constant.frag +++ /dev/null @@ -1,7 +0,0 @@ -void main() -{ - gl_FragColor = mix(vec4(1.0, 0.0, 2.0, 0.0), - vec4(0.0, 1.0, 0.0, 2.0), - vec4(0.5, 0.5, 0.75, 0.25)); - -} diff --git a/tests/shaders/glsl-fs-mix-constant.shader_test b/tests/shaders/glsl-fs-mix-constant.shader_test new file mode 100644 index 00000000..9c8b0c33 --- /dev/null +++ b/tests/shaders/glsl-fs-mix-constant.shader_test @@ -0,0 +1,23 @@ +[require] +GLSL >= 1.10 + +[vertex shader] +void main() +{ + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; +} + +[fragment shader] +void main() +{ + gl_FragColor = mix(vec4(1.0, 0.0, 2.0, 0.0), + vec4(0.0, 1.0, 0.0, 2.0), + vec4(0.5, 0.5, 0.75, 0.25)); +} + +[test] +clear color 0.0 1.0 0.0 0.0 +clear +ortho +draw rect 10 10 10 10 +probe rgba 15 15 0.5 0.5 0.5 0.5 |