On 13 March 2012 15:18, Kenneth Graunke <span dir="ltr">&lt;<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>&gt;</span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="im">On 03/12/2012 02:41 PM, Paul Berry wrote:<br>
</div><div class="im"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Previously these tests didn&#39;t initialize GLEW, presumably because they<br>
only use GL 1.0 functions, and those functions bypass GLEW.  But once<br>
</blockquote>
<br></div>
I think you&#39;re right here (for example, glClear), but note that these also call glXGetProcAddress.<br></blockquote><div><br>Good point.  I&#39;ll clarify the commit message.<br> </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">

<br>
Acked-by: Kenneth Graunke &lt;<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>&gt;<div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
we switch to using piglit-dispatch instead of GLEW, we will need to<br>
initialize it in order for any GL functions to work.  This patch adds<br>
a call to glewInit() in the place where a call to<br>
piglit_dispatch_default_init() will eventually be needed.<br>
---<br>
  tests/glx/glx-copy-sub-buffer.<u></u>c           |    1 +<br>
  tests/glx/glx-destroycontext-<u></u>1.c          |    1 +<br>
  tests/glx/glx-destroycontext-<u></u>2.c          |    1 +<br>
  tests/glx/glx-make-current.c              |    1 +<br>
  tests/glx/glx-make-<u></u>glxdrawable-current.c  |    1 +<br>
  tests/glx/glx-multithread-<u></u>makecurrent-1.c |    1 +<br>
  tests/glx/glx-multithread-<u></u>makecurrent-2.c |    1 +<br>
  tests/glx/glx-multithread-<u></u>makecurrent-3.c |    1 +<br>
  tests/glx/glx-multithread-<u></u>makecurrent-4.c |    1 +<br>
  tests/glx/glx-multithread.c               |    1 +<br>
  tests/glx/glx-swap-pixmap-bad.<u></u>c           |    1 +<br>
  tests/glx/glx-swap-pixmap.c               |    1 +<br>
  tests/glx/glx-swap-<u></u>singlebuffer.c         |    1 +<br>
  tests/glx/glx-visuals-depth.c             |    1 +<br>
  tests/glx/glx-visuals-stencil.<u></u>c           |    1 +<br>
  15 files changed, 15 insertions(+), 0 deletions(-)<br>
<br>
diff --git a/tests/glx/glx-copy-sub-<u></u>buffer.c b/tests/glx/glx-copy-sub-<u></u>buffer.c<br>
index a25b758..a777e05 100644<br>
--- a/tests/glx/glx-copy-sub-<u></u>buffer.c<br>
+++ b/tests/glx/glx-copy-sub-<u></u>buffer.c<br>
@@ -52,6 +52,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win_one, ctx);<br>
+       glewInit();<br>
<br>
        glClearColor(1.0, 0.0, 0.0, 0.0);<br>
        glClear(GL_COLOR_BUFFER_BIT);<br>
diff --git a/tests/glx/glx-<u></u>destroycontext-1.c b/tests/glx/glx-<u></u>destroycontext-1.c<br>
index 8beb1fb..88e46a7 100644<br>
--- a/tests/glx/glx-<u></u>destroycontext-1.c<br>
+++ b/tests/glx/glx-<u></u>destroycontext-1.c<br>
@@ -48,6 +48,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
        glClearColor(1.0, 0.0, 0.0, 1.0);<br>
        glClear(GL_COLOR_BUFFER_BIT);<br>
        glXMakeCurrent(dpy, None, NULL);<br>
diff --git a/tests/glx/glx-<u></u>destroycontext-2.c b/tests/glx/glx-<u></u>destroycontext-2.c<br>
index 8da12e9..a4c4d50 100644<br>
--- a/tests/glx/glx-<u></u>destroycontext-2.c<br>
+++ b/tests/glx/glx-<u></u>destroycontext-2.c<br>
@@ -48,6 +48,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
        glClearColor(1.0, 0.0, 0.0, 1.0);<br>
        glClear(GL_COLOR_BUFFER_BIT);<br>
        glXDestroyContext(dpy, ctx);<br>
diff --git a/tests/glx/glx-make-current.c b/tests/glx/glx-make-current.c<br>
index c80776a..d33b7dc 100644<br>
--- a/tests/glx/glx-make-current.c<br>
+++ b/tests/glx/glx-make-current.c<br>
@@ -49,6 +49,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win_one, ctx);<br>
+       glewInit();<br>
<br>
        glClearColor(0.0, 1.0, 0.0, 1.0);<br>
        glClear(GL_COLOR_BUFFER_BIT);<br>
diff --git a/tests/glx/glx-make-<u></u>glxdrawable-current.c b/tests/glx/glx-make-<u></u>glxdrawable-current.c<br>
index 8050c04..8888fb4 100644<br>
--- a/tests/glx/glx-make-<u></u>glxdrawable-current.c<br>
+++ b/tests/glx/glx-make-<u></u>glxdrawable-current.c<br>
@@ -76,6 +76,7 @@ draw(Display *dpy)<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
<br>
        glXMakeCurrent(dpy, glxwin_one, ctx);<br>
+       glewInit();<br>
<br>
        glClearColor(0.0, 1.0, 0.0, 1.0);<br>
        glClear(GL_COLOR_BUFFER_BIT);<br>
diff --git a/tests/glx/glx-multithread-<u></u>makecurrent-1.c b/tests/glx/glx-multithread-<u></u>makecurrent-1.c<br>
index dcfb8db..033e147 100644<br>
--- a/tests/glx/glx-multithread-<u></u>makecurrent-1.c<br>
+++ b/tests/glx/glx-multithread-<u></u>makecurrent-1.c<br>
@@ -107,6 +107,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        piglit_require_glx_extension(<u></u>dpy, &quot;MESA_multithread_makecurrent&quot;<u></u>);<br>
<br>
diff --git a/tests/glx/glx-multithread-<u></u>makecurrent-2.c b/tests/glx/glx-multithread-<u></u>makecurrent-2.c<br>
index 819f5db..7e508f8 100644<br>
--- a/tests/glx/glx-multithread-<u></u>makecurrent-2.c<br>
+++ b/tests/glx/glx-multithread-<u></u>makecurrent-2.c<br>
@@ -108,6 +108,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        piglit_require_glx_extension(<u></u>dpy, &quot;MESA_multithread_makecurrent&quot;<u></u>);<br>
<br>
diff --git a/tests/glx/glx-multithread-<u></u>makecurrent-3.c b/tests/glx/glx-multithread-<u></u>makecurrent-3.c<br>
index 6eaae96..2b655b7 100644<br>
--- a/tests/glx/glx-multithread-<u></u>makecurrent-3.c<br>
+++ b/tests/glx/glx-multithread-<u></u>makecurrent-3.c<br>
@@ -100,6 +100,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        piglit_require_glx_extension(<u></u>dpy, &quot;MESA_multithread_makecurrent&quot;<u></u>);<br>
<br>
diff --git a/tests/glx/glx-multithread-<u></u>makecurrent-4.c b/tests/glx/glx-multithread-<u></u>makecurrent-4.c<br>
index 48e50db..ab7a31d 100644<br>
--- a/tests/glx/glx-multithread-<u></u>makecurrent-4.c<br>
+++ b/tests/glx/glx-multithread-<u></u>makecurrent-4.c<br>
@@ -100,6 +100,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        piglit_require_glx_extension(<u></u>dpy, &quot;MESA_multithread_makecurrent&quot;<u></u>);<br>
<br>
diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c<br>
index d01c8e9..ee522d8 100644<br>
--- a/tests/glx/glx-multithread.c<br>
+++ b/tests/glx/glx-multithread.c<br>
@@ -79,6 +79,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        /* Clear background to gray */<br>
        glClearColor(0.5, 0.5, 0.5, 1.0);<br>
diff --git a/tests/glx/glx-swap-pixmap-<u></u>bad.c b/tests/glx/glx-swap-pixmap-<u></u>bad.c<br>
index 614dd6f..5994bff 100644<br>
--- a/tests/glx/glx-swap-pixmap-<u></u>bad.c<br>
+++ b/tests/glx/glx-swap-pixmap-<u></u>bad.c<br>
@@ -73,6 +73,7 @@ main(int argc, char **argv)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, g, ctx);<br>
+       glewInit();<br>
<br>
        /* Clear to green */<br>
        glClearColor(0.0, 1.0, 0.0, 0.0);<br>
diff --git a/tests/glx/glx-swap-pixmap.c b/tests/glx/glx-swap-pixmap.c<br>
index 1c26a08..0d23302 100644<br>
--- a/tests/glx/glx-swap-pixmap.c<br>
+++ b/tests/glx/glx-swap-pixmap.c<br>
@@ -65,6 +65,7 @@ main(int argc, char **argv)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, g, ctx);<br>
+       glewInit();<br>
<br>
        /* Clear to green */<br>
        glClearColor(0.0, 1.0, 0.0, 0.0);<br>
diff --git a/tests/glx/glx-swap-<u></u>singlebuffer.c b/tests/glx/glx-swap-<u></u>singlebuffer.c<br>
index b04a44a..ef511e1 100644<br>
--- a/tests/glx/glx-swap-<u></u>singlebuffer.c<br>
+++ b/tests/glx/glx-swap-<u></u>singlebuffer.c<br>
@@ -48,6 +48,7 @@ draw(Display *dpy)<br>
<br>
        ctx = piglit_get_glx_context(dpy, visinfo);<br>
        glXMakeCurrent(dpy, win, ctx);<br>
+       glewInit();<br>
<br>
        /* Clear to green */<br>
        glClearColor(0.0, 1.0, 0.0, 0.0);<br>
diff --git a/tests/glx/glx-visuals-depth.<u></u>c b/tests/glx/glx-visuals-depth.<u></u>c<br>
index b263e80..b0bd2d5 100644<br>
--- a/tests/glx/glx-visuals-depth.<u></u>c<br>
+++ b/tests/glx/glx-visuals-depth.<u></u>c<br>
@@ -50,6 +50,7 @@ draw(Display *dpy, GLXFBConfig config)<br>
        float *left, *right;<br>
        bool pass = true;<br>
<br>
+       glewInit();<br>
        glXGetFBConfigAttrib(dpy, config, GLX_DEPTH_SIZE,&amp;dbits);<br>
<br>
        piglit_ortho_projection(<u></u>piglit_width, piglit_height, false);<br>
diff --git a/tests/glx/glx-visuals-<u></u>stencil.c b/tests/glx/glx-visuals-<u></u>stencil.c<br>
index 332fdf6..71beef0 100644<br>
--- a/tests/glx/glx-visuals-<u></u>stencil.c<br>
+++ b/tests/glx/glx-visuals-<u></u>stencil.c<br>
@@ -50,6 +50,7 @@ draw(Display *dpy, GLXFBConfig config)<br>
        float *left, *right;<br>
        bool pass = true;<br>
<br>
+       glewInit();<br>
        glXGetFBConfigAttrib(dpy, config, GLX_STENCIL_SIZE,&amp;sbits);<br>
<br>
        piglit_ortho_projection(<u></u>piglit_width, piglit_height, false);<br>
</blockquote>
<br>
</div></div></blockquote></div><br>