diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-22 16:04:35 +0200 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:29 -0700 |
| commit | 15e7655425bd1b14824fba91015c4bc6c1b8b359 (patch) | |
| tree | 73d0aad432aaa710b93daaa3f5a8c90db6c15295 /tests/spec/arb_vertex_program | |
| parent | b8ec67144506f806780c06f00252c421811b238a (diff) | |
util,tests: Replace GLUT visual enums with PIGLTI_GL_VISUAL enums (v2)
I'm trying to transition Piglit from using GLUT to using Waffle. That
requires either killing or wrapping all GLUT code.
Define enum piglit_gl_visual in piglit-framework.h, of which each value
matches its corresponding GLUT visual enum.
Do the following substitution in all util and test sources:
GLUT_RGB -> PIGLIT_GL_VISUAL_RGB
GLUT_RGBA -> PIGLIT_GL_VISUAL_RGBA
GLUT_DOUBLE -> PIGLIT_GL_VISUAL_DOUBLE
GLUT_ACCUM -> PIGLIT_GL_VISUAL_ACCUM
GLUT_ALPHA -> PIGLIT_GL_VISUAL_ALPHA
GLUT_DEPTH -> PIGLIT_GL_VISUAL_DEPTH
GLUT_STENCIL -> PIGLIT_GL_VISUAL_STENCIL
v2: Remove GLUT_INDEX, for Ken.
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
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/spec/arb_vertex_program')
| -rw-r--r-- | tests/spec/arb_vertex_program/getenv4d-with-error.c | 2 | ||||
| -rw-r--r-- | tests/spec/arb_vertex_program/getlocal4d-with-error.c | 2 | ||||
| -rw-r--r-- | tests/spec/arb_vertex_program/minmax.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/spec/arb_vertex_program/getenv4d-with-error.c b/tests/spec/arb_vertex_program/getenv4d-with-error.c index 6bdfc7cb4..baa976f13 100644 --- a/tests/spec/arb_vertex_program/getenv4d-with-error.c +++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_vertex_program/getlocal4d-with-error.c b/tests/spec/arb_vertex_program/getlocal4d-with-error.c index 243fd4f93..b1fef8392 100644 --- a/tests/spec/arb_vertex_program/getlocal4d-with-error.c +++ b/tests/spec/arb_vertex_program/getlocal4d-with-error.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_vertex_program/minmax.c b/tests/spec/arb_vertex_program/minmax.c index 461d17339..3a7bc2f68 100644 --- a/tests/spec/arb_vertex_program/minmax.c +++ b/tests/spec/arb_vertex_program/minmax.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) |