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_shader_objects | |
| 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_shader_objects')
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index d5a675fb1..2c6eadcba 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index 833dcc8a2..d234191de 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -35,7 +35,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) static const char *vs_source = "void main()\n" diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index f4497de2b..b87718c44 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -32,7 +32,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) static const char *vs_source = "void main()\n" diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index 317717028..9bfacef9c 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -35,7 +35,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) diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index a69a2589e..e81a4e2f4 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -31,7 +31,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) diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index b4abe3cd7..0c684c0ef 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char *vs_code = "struct S { mat4 m; vec4 v[10]; };\n" |