summaryrefslogtreecommitdiff
path: root/tests/bugs
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-09-22 16:04:35 +0200
committerChad Versace <chad.versace@linux.intel.com>2012-10-09 19:08:29 -0700
commit15e7655425bd1b14824fba91015c4bc6c1b8b359 (patch)
tree73d0aad432aaa710b93daaa3f5a8c90db6c15295 /tests/bugs
parentb8ec67144506f806780c06f00252c421811b238a (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/bugs')
-rw-r--r--tests/bugs/crash-cubemap-order.c2
-rw-r--r--tests/bugs/crash-texparameter-before-teximage.c2
-rw-r--r--tests/bugs/drawbuffer-modes.c2
-rw-r--r--tests/bugs/fdo10370.c2
-rw-r--r--tests/bugs/fdo14575.c2
-rw-r--r--tests/bugs/fdo20701.c2
-rw-r--r--tests/bugs/fdo22540.c2
-rw-r--r--tests/bugs/fdo23489.c2
-rw-r--r--tests/bugs/fdo23670-depth_test.c2
-rw-r--r--tests/bugs/fdo23670-drawpix_stencil.c2
-rw-r--r--tests/bugs/fdo24066.c2
-rw-r--r--tests/bugs/fdo25614-genmipmap.c2
-rw-r--r--tests/bugs/fdo28551.c2
-rw-r--r--tests/bugs/fdo31934.c2
-rw-r--r--tests/bugs/fdo9833.c2
-rw-r--r--tests/bugs/point-sprite.c2
-rw-r--r--tests/bugs/r300-readcache.c2
-rw-r--r--tests/bugs/tex1d-2dborder.c2
-rw-r--r--tests/bugs/tri-tex-crash.c2
-rw-r--r--tests/bugs/vbo-buffer-unmap.c2
20 files changed, 20 insertions, 20 deletions
diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c
index 4595e8e0d..f5c570567 100644
--- a/tests/bugs/crash-cubemap-order.c
+++ b/tests/bugs/crash-cubemap-order.c
@@ -11,7 +11,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA)
enum piglit_result
piglit_display(void)
diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c
index 345eabb91..e1ca76bb2 100644
--- a/tests/bugs/crash-texparameter-before-teximage.c
+++ b/tests/bugs/crash-texparameter-before-teximage.c
@@ -12,7 +12,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA)
enum piglit_result
piglit_display(void)
diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c
index 30cb7edb4..44a264819 100644
--- a/tests/bugs/drawbuffer-modes.c
+++ b/tests/bugs/drawbuffer-modes.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)
float color[7][4] = {
{ 0.1, 0.2, 0.3, 1.0 },
diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c
index 5fd84f349..f050adcd6 100644
--- a/tests/bugs/fdo10370.c
+++ b/tests/bugs/fdo10370.c
@@ -8,7 +8,7 @@
PIGLIT_GL_TEST_MAIN(
128 /*window_width*/,
128 /*window_height*/,
- GLUT_SINGLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB)
#define BITMAP_WIDTH 1
#define BITMAP_HEIGHT 1
diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c
index 0748230ad..2d8865aeb 100644
--- a/tests/bugs/fdo14575.c
+++ b/tests/bugs/fdo14575.c
@@ -35,7 +35,7 @@
PIGLIT_GL_TEST_MAIN(
128 /*window_width*/,
128 /*window_height*/,
- GLUT_SINGLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB)
void
piglit_init(int argc, char**argv)
diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c
index 08afed65e..cf7d0bbd2 100644
--- a/tests/bugs/fdo20701.c
+++ b/tests/bugs/fdo20701.c
@@ -39,7 +39,7 @@
PIGLIT_GL_TEST_MAIN(
128 /*window_width*/,
128 /*window_height*/,
- GLUT_RGB)
+ PIGLIT_GL_VISUAL_RGB)
static GLuint fb;
static GLuint tex;
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c
index 2df694bce..b28f17f96 100644
--- a/tests/bugs/fdo22540.c
+++ b/tests/bugs/fdo22540.c
@@ -28,7 +28,7 @@
PIGLIT_GL_TEST_MAIN(
400 /*window_width*/,
300 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB)
static GLuint vBuffer;
diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c
index ae206bf22..f4e2195c5 100644
--- a/tests/bugs/fdo23489.c
+++ b/tests/bugs/fdo23489.c
@@ -8,7 +8,7 @@
PIGLIT_GL_TEST_MAIN(
250 /*window_width*/,
250 /*window_height*/,
- GLUT_SINGLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB)
enum piglit_result
piglit_display(void)
diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c
index cf72240bd..0b806f656 100644
--- a/tests/bugs/fdo23670-depth_test.c
+++ b/tests/bugs/fdo23670-depth_test.c
@@ -29,7 +29,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
void
piglit_init(int argc, char **argv)
diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c
index ac13a00a8..f254a8d31 100644
--- a/tests/bugs/fdo23670-drawpix_stencil.c
+++ b/tests/bugs/fdo23670-drawpix_stencil.c
@@ -29,7 +29,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
void
piglit_init(int argc, char **argv)
diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c
index 2d8b1bd30..d0fc3750d 100644
--- a/tests/bugs/fdo24066.c
+++ b/tests/bugs/fdo24066.c
@@ -38,7 +38,7 @@
PIGLIT_GL_TEST_MAIN(
16 /*window_width*/,
16 /*window_height*/,
- GLUT_RGBA)
+ PIGLIT_GL_VISUAL_RGBA)
enum piglit_result piglit_display(void)
{
diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c
index 804ac9b81..7c90ec50c 100644
--- a/tests/bugs/fdo25614-genmipmap.c
+++ b/tests/bugs/fdo25614-genmipmap.c
@@ -43,7 +43,7 @@
PIGLIT_GL_TEST_MAIN(
(BOX_SIZE + 2) * TEST_COLS + 1 /*window_width*/,
(BOX_SIZE + 1) + 1 /*window_height*/,
- GLUT_RGB | GLUT_DOUBLE)
+ PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
static GLuint tex[1];
diff --git a/tests/bugs/fdo28551.c b/tests/bugs/fdo28551.c
index e256571fe..dc4173f7b 100644
--- a/tests/bugs/fdo28551.c
+++ b/tests/bugs/fdo28551.c
@@ -29,7 +29,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
enum piglit_result
piglit_display(void)
diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c
index c1960e3a6..f1c69b53b 100644
--- a/tests/bugs/fdo31934.c
+++ b/tests/bugs/fdo31934.c
@@ -3,7 +3,7 @@
PIGLIT_GL_TEST_MAIN(
512 /*window_width*/,
512 /*window_height*/,
- GLUT_RGBA)
+ PIGLIT_GL_VISUAL_RGBA)
void
piglit_init(int argc, char *argv[])
diff --git a/tests/bugs/fdo9833.c b/tests/bugs/fdo9833.c
index 0192ec1d8..8d8ca39ed 100644
--- a/tests/bugs/fdo9833.c
+++ b/tests/bugs/fdo9833.c
@@ -8,7 +8,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA)
enum piglit_result
piglit_display(void)
diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c
index 2862b6380..1b429d531 100644
--- a/tests/bugs/point-sprite.c
+++ b/tests/bugs/point-sprite.c
@@ -38,7 +38,7 @@
PIGLIT_GL_TEST_MAIN(
1 + ((BOX_SIZE + 1) * TEST_COLS) /*window_width*/,
1 + ((BOX_SIZE + 1) * TEST_ROWS) /*window_height*/,
- GLUT_DOUBLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB)
static float maxSize = 0.0f;
static GLuint tex;
diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c
index 6f0a65aab..4982c1cc6 100644
--- a/tests/bugs/r300-readcache.c
+++ b/tests/bugs/r300-readcache.c
@@ -21,7 +21,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGBA)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA)
static GLfloat colors[8][3] = {
{ 1.0, 1.0, 1.0 },
diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c
index 4d04a9e52..be0cebc15 100644
--- a/tests/bugs/tex1d-2dborder.c
+++ b/tests/bugs/tex1d-2dborder.c
@@ -36,7 +36,7 @@
PIGLIT_GL_TEST_MAIN(
256 /*window_width*/,
128 /*window_height*/,
- GLUT_RGB | GLUT_DOUBLE)
+ PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
static const GLfloat TextureColor[3] = { 1.0, 0.5, 0.0 };
diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c
index ee1a3a65d..6702e60a9 100644
--- a/tests/bugs/tri-tex-crash.c
+++ b/tests/bugs/tri-tex-crash.c
@@ -33,7 +33,7 @@
PIGLIT_GL_TEST_MAIN(
400 /*window_width*/,
400 /*window_height*/,
- GLUT_RGB | GLUT_DOUBLE)
+ PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
static void
make_texture(void)
diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c
index 9be058555..b5e97000c 100644
--- a/tests/bugs/vbo-buffer-unmap.c
+++ b/tests/bugs/vbo-buffer-unmap.c
@@ -36,7 +36,7 @@
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
100 /*window_height*/,
- GLUT_DOUBLE | GLUT_RGB)
+ PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB)
enum piglit_result
piglit_display(void)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 22:28:15 +0000