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/security | |
| 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/security')
| -rw-r--r-- | tests/security/initialized-fbo.c | 2 | ||||
| -rw-r--r-- | tests/security/initialized-texmemory.c | 2 | ||||
| -rw-r--r-- | tests/security/initialized-vbo.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/security/initialized-fbo.c b/tests/security/initialized-fbo.c index 42797571..85acd90f 100644 --- a/tests/security/initialized-fbo.c +++ b/tests/security/initialized-fbo.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint fbo, rb; diff --git a/tests/security/initialized-texmemory.c b/tests/security/initialized-texmemory.c index e1c26992..68d318d0 100644 --- a/tests/security/initialized-texmemory.c +++ b/tests/security/initialized-texmemory.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result diff --git a/tests/security/initialized-vbo.c b/tests/security/initialized-vbo.c index 5caf0eeb..eb167dcd 100644 --- a/tests/security/initialized-vbo.c +++ b/tests/security/initialized-vbo.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result |