diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-28 06:13:10 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:31 -0700 |
| commit | 973db3e1743682c6ac8f58301c5e8f97588f6520 (patch) | |
| tree | 1cda2236128063df45f52809b4219e41a1e2d7ae /tests/texturing/texsubimage.c | |
| parent | 8ed4af46b76cb7fe74ed6d228302141f66d49dc4 (diff) | |
util: Convert GL tests to use PIGLIT_GL_CONFIG_BEGIN/END
This patch has two components.
1. In tests/util/piglit-framework-gl.h, replace the definition of
PIGLIT_GL_TEST_MAIN with the macro block PIGLIT_GL_CONFIG_BEGIN/END.
The macro PIGLIT_GL_TEST_MAIN was very restrictive. It was a fixed-arity
macro function that allowed a test to set only set 3 values: window width,
height, and visual. It would have been difficult to shoehorn optional test
attributes into such a fixed-arity macro function. Allowing optional
attributes is an essential feature because a following commit adds
optional fields to struct piglit_gl_test_config.
The macro block PIGLIT_GL_TEST_CONFIG_BEGIN/END is more flexible. Within
it the test is allowed to arbitrarilty modify the piglit_gl_test_config
structure.
2. In each GL test source, replace PIGLIT_GL_TEST_MAIN with
a PIGLIT_GL_TEST_CONFIG_BEGIN/END block.
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/texturing/texsubimage.c')
| -rw-r--r-- | tests/texturing/texsubimage.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index 1e0e16c9d..ee8fc655b 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -35,10 +35,13 @@ #include "piglit-util-gl-common.h" #include "../fbo/fbo-formats.h" -PIGLIT_GL_TEST_MAIN( - 150 /*window_width*/, - 150 /*window_height*/, - PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.window_width = 150; + config.window_height = 150; + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END /** * This is a subset of the formats in fbo-formats.h |