aboutsummaryrefslogtreecommitdiff
path: root/tests/glx
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-11-13 15:51:09 -0800
committerChad Versace <chad.versace@linux.intel.com>2012-11-14 08:14:24 -0800
commit24a6cd03c533a800e52bb28a58c0cf835dcc951b (patch)
treed7390956ebec9726e57d84ad15a613487e8075a0 /tests/glx
parent1bd872a1347bc7ad9a1042c379bd0d0dfe9ace5c (diff)
util: Kill macro glewInit
No test actually called glewInit(), because piglit-dispatch #define'd it to piglit_dispatch_default_init(). This patch removes the macro and replaces each call to glewInit() with piglit_dispatch_default_init(). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/glx')
-rw-r--r--tests/glx/glx-copy-sub-buffer.c2
-rw-r--r--tests/glx/glx-destroycontext-1.c2
-rw-r--r--tests/glx/glx-destroycontext-2.c2
-rw-r--r--tests/glx/glx-fbo-binding.c2
-rw-r--r--tests/glx/glx-make-current.c2
-rw-r--r--tests/glx/glx-make-glxdrawable-current.c2
-rw-r--r--tests/glx/glx-multi-context-ib-1.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-1.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-2.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-3.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-4.c2
-rw-r--r--tests/glx/glx-multithread.c2
-rw-r--r--tests/glx/glx-shader-sharing.c2
-rw-r--r--tests/glx/glx-swap-pixmap-bad.c2
-rw-r--r--tests/glx/glx-swap-pixmap.c2
-rw-r--r--tests/glx/glx-swap-singlebuffer.c2
-rw-r--r--tests/glx/glx-tfp.c2
-rw-r--r--tests/glx/glx-visuals-depth.c2
-rw-r--r--tests/glx/glx-visuals-stencil.c2
19 files changed, 19 insertions, 19 deletions
diff --git a/tests/glx/glx-copy-sub-buffer.c b/tests/glx/glx-copy-sub-buffer.c
index dcd029cd..c6561f87 100644
--- a/tests/glx/glx-copy-sub-buffer.c
+++ b/tests/glx/glx-copy-sub-buffer.c
@@ -52,7 +52,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win_one, ctx);
- glewInit();
+ piglit_dispatch_default_init();
glClearColor(1.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
diff --git a/tests/glx/glx-destroycontext-1.c b/tests/glx/glx-destroycontext-1.c
index eb8557b5..91dc82fa 100644
--- a/tests/glx/glx-destroycontext-1.c
+++ b/tests/glx/glx-destroycontext-1.c
@@ -48,7 +48,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
glClearColor(1.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
glXMakeCurrent(dpy, None, NULL);
diff --git a/tests/glx/glx-destroycontext-2.c b/tests/glx/glx-destroycontext-2.c
index 524ffe7d..9c591a0d 100644
--- a/tests/glx/glx-destroycontext-2.c
+++ b/tests/glx/glx-destroycontext-2.c
@@ -48,7 +48,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
glClearColor(1.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
glXDestroyContext(dpy, ctx);
diff --git a/tests/glx/glx-fbo-binding.c b/tests/glx/glx-fbo-binding.c
index cd5872ce..090cd097 100644
--- a/tests/glx/glx-fbo-binding.c
+++ b/tests/glx/glx-fbo-binding.c
@@ -111,7 +111,7 @@ main(int argc, char **argv)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, Windows[0], ctx);
- glewInit();
+ piglit_dispatch_default_init();
piglit_glx_event_loop(dpy, draw);
diff --git a/tests/glx/glx-make-current.c b/tests/glx/glx-make-current.c
index 59a88630..d56fcdbc 100644
--- a/tests/glx/glx-make-current.c
+++ b/tests/glx/glx-make-current.c
@@ -49,7 +49,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win_one, ctx);
- glewInit();
+ piglit_dispatch_default_init();
glClearColor(0.0, 1.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
diff --git a/tests/glx/glx-make-glxdrawable-current.c b/tests/glx/glx-make-glxdrawable-current.c
index 41643437..919458d0 100644
--- a/tests/glx/glx-make-glxdrawable-current.c
+++ b/tests/glx/glx-make-glxdrawable-current.c
@@ -76,7 +76,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, glxwin_one, ctx);
- glewInit();
+ piglit_dispatch_default_init();
glClearColor(0.0, 1.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
diff --git a/tests/glx/glx-multi-context-ib-1.c b/tests/glx/glx-multi-context-ib-1.c
index 0f3b428d..1e77b7a2 100644
--- a/tests/glx/glx-multi-context-ib-1.c
+++ b/tests/glx/glx-multi-context-ib-1.c
@@ -189,7 +189,7 @@ main(int argc, char **argv)
ctx1 = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx0);
- glewInit();
+ piglit_dispatch_default_init();
piglit_require_extension("GL_ARB_vertex_buffer_object");
context0_init();
glXMakeCurrent(dpy, win, ctx1);
diff --git a/tests/glx/glx-multithread-makecurrent-1.c b/tests/glx/glx-multithread-makecurrent-1.c
index 2ab25517..899d6073 100644
--- a/tests/glx/glx-multithread-makecurrent-1.c
+++ b/tests/glx/glx-multithread-makecurrent-1.c
@@ -107,7 +107,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
piglit_require_glx_extension(dpy, "MESA_multithread_makecurrent");
diff --git a/tests/glx/glx-multithread-makecurrent-2.c b/tests/glx/glx-multithread-makecurrent-2.c
index a6fc7d7f..8f1aa9bc 100644
--- a/tests/glx/glx-multithread-makecurrent-2.c
+++ b/tests/glx/glx-multithread-makecurrent-2.c
@@ -108,7 +108,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
piglit_require_glx_extension(dpy, "MESA_multithread_makecurrent");
diff --git a/tests/glx/glx-multithread-makecurrent-3.c b/tests/glx/glx-multithread-makecurrent-3.c
index a4fd736d..cf6cb16d 100644
--- a/tests/glx/glx-multithread-makecurrent-3.c
+++ b/tests/glx/glx-multithread-makecurrent-3.c
@@ -100,7 +100,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
piglit_require_glx_extension(dpy, "MESA_multithread_makecurrent");
diff --git a/tests/glx/glx-multithread-makecurrent-4.c b/tests/glx/glx-multithread-makecurrent-4.c
index 91a897b8..bd48f020 100644
--- a/tests/glx/glx-multithread-makecurrent-4.c
+++ b/tests/glx/glx-multithread-makecurrent-4.c
@@ -100,7 +100,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
piglit_require_glx_extension(dpy, "MESA_multithread_makecurrent");
diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c
index ca195059..10095f37 100644
--- a/tests/glx/glx-multithread.c
+++ b/tests/glx/glx-multithread.c
@@ -79,7 +79,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
/* Clear background to gray */
glClearColor(0.5, 0.5, 0.5, 1.0);
diff --git a/tests/glx/glx-shader-sharing.c b/tests/glx/glx-shader-sharing.c
index 7506d657..c1ed9fac 100644
--- a/tests/glx/glx-shader-sharing.c
+++ b/tests/glx/glx-shader-sharing.c
@@ -88,7 +88,7 @@ draw(Display *dpy)
*/
glXMakeCurrent(dpy, win, ctx1);
- glewInit();
+ piglit_dispatch_default_init();
if (piglit_get_gl_version() < 20) {
printf("%s: Requires OpenGL 2.0\n", TestName);
diff --git a/tests/glx/glx-swap-pixmap-bad.c b/tests/glx/glx-swap-pixmap-bad.c
index df296265..bc471fc5 100644
--- a/tests/glx/glx-swap-pixmap-bad.c
+++ b/tests/glx/glx-swap-pixmap-bad.c
@@ -73,7 +73,7 @@ main(int argc, char **argv)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, g, ctx);
- glewInit();
+ piglit_dispatch_default_init();
/* Clear to green */
glClearColor(0.0, 1.0, 0.0, 0.0);
diff --git a/tests/glx/glx-swap-pixmap.c b/tests/glx/glx-swap-pixmap.c
index a4dfb5cc..1a91578a 100644
--- a/tests/glx/glx-swap-pixmap.c
+++ b/tests/glx/glx-swap-pixmap.c
@@ -65,7 +65,7 @@ main(int argc, char **argv)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, g, ctx);
- glewInit();
+ piglit_dispatch_default_init();
/* Clear to green */
glClearColor(0.0, 1.0, 0.0, 0.0);
diff --git a/tests/glx/glx-swap-singlebuffer.c b/tests/glx/glx-swap-singlebuffer.c
index 78cdf210..73a065da 100644
--- a/tests/glx/glx-swap-singlebuffer.c
+++ b/tests/glx/glx-swap-singlebuffer.c
@@ -48,7 +48,7 @@ draw(Display *dpy)
ctx = piglit_get_glx_context(dpy, visinfo);
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
/* Clear to green */
glClearColor(0.0, 1.0, 0.0, 0.0);
diff --git a/tests/glx/glx-tfp.c b/tests/glx/glx-tfp.c
index 0f99974f..659c4520 100644
--- a/tests/glx/glx-tfp.c
+++ b/tests/glx/glx-tfp.c
@@ -320,7 +320,7 @@ int main(int argc, char**argv)
glXMakeCurrent(dpy, win, ctx);
- glewInit();
+ piglit_dispatch_default_init();
if (piglit_automatic)
piglit_glx_set_no_input();
diff --git a/tests/glx/glx-visuals-depth.c b/tests/glx/glx-visuals-depth.c
index ba147e2c..e7dad45a 100644
--- a/tests/glx/glx-visuals-depth.c
+++ b/tests/glx/glx-visuals-depth.c
@@ -50,7 +50,7 @@ draw(Display *dpy, GLXFBConfig config)
float *left, *right;
bool pass = true;
- glewInit();
+ piglit_dispatch_default_init();
glXGetFBConfigAttrib(dpy, config, GLX_DEPTH_SIZE, &dbits);
piglit_ortho_projection(piglit_width, piglit_height, false);
diff --git a/tests/glx/glx-visuals-stencil.c b/tests/glx/glx-visuals-stencil.c
index ecbe5cd3..d82675b1 100644
--- a/tests/glx/glx-visuals-stencil.c
+++ b/tests/glx/glx-visuals-stencil.c
@@ -50,7 +50,7 @@ draw(Display *dpy, GLXFBConfig config)
float *left, *right;
bool pass = true;
- glewInit();
+ piglit_dispatch_default_init();
glXGetFBConfigAttrib(dpy, config, GLX_STENCIL_SIZE, &sbits);
piglit_ortho_projection(piglit_width, piglit_height, false);