From dc18ec8b24e206c60de681a505bf66ae74e37742 Mon Sep 17 00:00:00 2001
From: Boyan Ding <boyan.j.ding@gmail.com>
Date: Wed, 25 Nov 2015 13:43:06 +0800
Subject: [PATCH] xlib: Unify the style of function pointer calls in structs

Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
[Emil Velikov: handle the final case in glXCreateContextAttribsARB]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---
 src/mesa/drivers/x11/glxapi.c | 148 +++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index cc1bb2ab4b3..07c1d842833 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -159,7 +159,7 @@ glXChooseVisual(Display *dpy, int screen, int *list)
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->ChooseVisual)(dpy, screen, list);
+   return t->ChooseVisual(dpy, screen, list);
 }
 
 
@@ -170,7 +170,7 @@ glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->CopyContext)(dpy, src, dst, mask);
+   t->CopyContext(dpy, src, dst, mask);
 }
 
 
@@ -181,7 +181,7 @@ glXCreateContext(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateContext)(dpy, visinfo, shareList, direct);
+   return t->CreateContext(dpy, visinfo, shareList, direct);
 }
 
 
@@ -192,7 +192,7 @@ glXCreateGLXPixmap(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateGLXPixmap)(dpy, visinfo, pixmap);
+   return t->CreateGLXPixmap(dpy, visinfo, pixmap);
 }
 
 
@@ -203,7 +203,7 @@ glXDestroyContext(Display *dpy, GLXContext ctx)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyContext)(dpy, ctx);
+   t->DestroyContext(dpy, ctx);
 }
 
 
@@ -214,7 +214,7 @@ glXDestroyGLXPixmap(Display *dpy, GLXPixmap pixmap)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyGLXPixmap)(dpy, pixmap);
+   t->DestroyGLXPixmap(dpy, pixmap);
 }
 
 
@@ -225,7 +225,7 @@ glXGetConfig(Display *dpy, XVisualInfo *visinfo, int attrib, int *value)
    GET_DISPATCH(dpy, t);
    if (!t)
       return GLX_NO_EXTENSION;
-   return (t->GetConfig)(dpy, visinfo, attrib, value);
+   return t->GetConfig(dpy, visinfo, attrib, value);
 }
 
 
@@ -254,7 +254,7 @@ glXIsDirect(Display *dpy, GLXContext ctx)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->IsDirect)(dpy, ctx);
+   return t->IsDirect(dpy, ctx);
 }
 
 
@@ -267,7 +267,7 @@ glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext ctx)
    if (!t) {
       return False;
    }
-   b = (*t->MakeCurrent)(dpy, drawable, ctx);
+   b = t->MakeCurrent(dpy, drawable, ctx);
    return b;
 }
 
@@ -279,7 +279,7 @@ glXQueryExtension(Display *dpy, int *errorb, int *event)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->QueryExtension)(dpy, errorb, event);
+   return t->QueryExtension(dpy, errorb, event);
 }
 
 
@@ -290,7 +290,7 @@ glXQueryVersion(Display *dpy, int *maj, int *min)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->QueryVersion)(dpy, maj, min);
+   return t->QueryVersion(dpy, maj, min);
 }
 
 
@@ -301,7 +301,7 @@ glXSwapBuffers(Display *dpy, GLXDrawable drawable)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->SwapBuffers)(dpy, drawable);
+   t->SwapBuffers(dpy, drawable);
 }
 
 
@@ -313,7 +313,7 @@ glXUseXFont(Font font, int first, int count, int listBase)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->UseXFont)(font, first, count, listBase);
+   t->UseXFont(font, first, count, listBase);
 }
 
 
@@ -325,7 +325,7 @@ glXWaitGL(void)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->WaitGL)();
+   t->WaitGL();
 }
 
 
@@ -337,7 +337,7 @@ glXWaitX(void)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->WaitX)();
+   t->WaitX();
 }
 
 
@@ -351,7 +351,7 @@ glXGetClientString(Display *dpy, int name)
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->GetClientString)(dpy, name);
+   return t->GetClientString(dpy, name);
 }
 
 
@@ -362,7 +362,7 @@ glXQueryExtensionsString(Display *dpy, int screen)
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->QueryExtensionsString)(dpy, screen);
+   return t->QueryExtensionsString(dpy, screen);
 }
 
 
@@ -373,7 +373,7 @@ glXQueryServerString(Display *dpy, int screen, int name)
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->QueryServerString)(dpy, screen, name);
+   return t->QueryServerString(dpy, screen, name);
 }
 
 
@@ -399,7 +399,7 @@ glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->ChooseFBConfig)(dpy, screen, attribList, nitems);
+   return t->ChooseFBConfig(dpy, screen, attribList, nitems);
 }
 
 
@@ -410,7 +410,7 @@ glXCreateNewContext(Display *dpy, GLXFBConfig config, int renderType, GLXContext
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateNewContext)(dpy, config, renderType, shareList, direct);
+   return t->CreateNewContext(dpy, config, renderType, shareList, direct);
 }
 
 
@@ -421,7 +421,7 @@ glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribList)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreatePbuffer)(dpy, config, attribList);
+   return t->CreatePbuffer(dpy, config, attribList);
 }
 
 
@@ -432,7 +432,7 @@ glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attr
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreatePixmap)(dpy, config, pixmap, attribList);
+   return t->CreatePixmap(dpy, config, pixmap, attribList);
 }
 
 
@@ -443,7 +443,7 @@ glXCreateWindow(Display *dpy, GLXFBConfig config, Window win, const int *attribL
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateWindow)(dpy, config, win, attribList);
+   return t->CreateWindow(dpy, config, win, attribList);
 }
 
 
@@ -454,7 +454,7 @@ glXDestroyPbuffer(Display *dpy, GLXPbuffer pbuf)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyPbuffer)(dpy, pbuf);
+   t->DestroyPbuffer(dpy, pbuf);
 }
 
 
@@ -465,7 +465,7 @@ glXDestroyPixmap(Display *dpy, GLXPixmap pixmap)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyPixmap)(dpy, pixmap);
+   t->DestroyPixmap(dpy, pixmap);
 }
 
 
@@ -476,7 +476,7 @@ glXDestroyWindow(Display *dpy, GLXWindow window)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyWindow)(dpy, window);
+   t->DestroyWindow(dpy, window);
 }
 
 
@@ -495,7 +495,7 @@ glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value
    GET_DISPATCH(dpy, t);
    if (!t)
       return GLX_NO_EXTENSION;
-   return (t->GetFBConfigAttrib)(dpy, config, attribute, value);
+   return t->GetFBConfigAttrib(dpy, config, attribute, value);
 }
 
 
@@ -506,7 +506,7 @@ glXGetFBConfigs(Display *dpy, int screen, int *nelements)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->GetFBConfigs)(dpy, screen, nelements);
+   return t->GetFBConfigs(dpy, screen, nelements);
 }
 
 void PUBLIC
@@ -516,7 +516,7 @@ glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->GetSelectedEvent)(dpy, drawable, mask);
+   t->GetSelectedEvent(dpy, drawable, mask);
 }
 
 
@@ -527,7 +527,7 @@ glXGetVisualFromFBConfig(Display *dpy, GLXFBConfig config)
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->GetVisualFromFBConfig)(dpy, config);
+   return t->GetVisualFromFBConfig(dpy, config);
 }
 
 
@@ -539,7 +539,7 @@ glXMakeContextCurrent(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXConte
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   b = (t->MakeContextCurrent)(dpy, draw, read, ctx);
+   b = t->MakeContextCurrent(dpy, draw, read, ctx);
    return b;
 }
 
@@ -552,7 +552,7 @@ glXQueryContext(Display *dpy, GLXContext ctx, int attribute, int *value)
    assert(t);
    if (!t)
       return 0; /* XXX correct? */
-   return (t->QueryContext)(dpy, ctx, attribute, value);
+   return t->QueryContext(dpy, ctx, attribute, value);
 }
 
 
@@ -563,7 +563,7 @@ glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned int *va
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->QueryDrawable)(dpy, draw, attribute, value);
+   t->QueryDrawable(dpy, draw, attribute, value);
 }
 
 
@@ -574,7 +574,7 @@ glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->SelectEvent)(dpy, drawable, mask);
+   t->SelectEvent(dpy, drawable, mask);
 }
 
 
@@ -589,7 +589,7 @@ glXSwapIntervalSGI(int interval)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->SwapIntervalSGI)(interval);
+   return t->SwapIntervalSGI(interval);
 }
 
 
@@ -604,7 +604,7 @@ glXGetVideoSyncSGI(unsigned int *count)
    GET_DISPATCH(dpy, t);
    if (!t || !glXGetCurrentContext())
       return GLX_BAD_CONTEXT;
-   return (t->GetVideoSyncSGI)(count);
+   return t->GetVideoSyncSGI(count);
 }
 
 int PUBLIC
@@ -615,7 +615,7 @@ glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count)
    GET_DISPATCH(dpy, t);
    if (!t || !glXGetCurrentContext())
       return GLX_BAD_CONTEXT;
-   return (t->WaitVideoSyncSGI)(divisor, remainder, count);
+   return t->WaitVideoSyncSGI(divisor, remainder, count);
 }
 
 
@@ -629,7 +629,7 @@ glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXConte
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->MakeCurrentReadSGI)(dpy, draw, read, ctx);
+   return t->MakeCurrentReadSGI(dpy, draw, read, ctx);
 }
 
 GLXDrawable PUBLIC
@@ -648,7 +648,7 @@ glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath pa
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateGLXVideoSourceSGIX)(dpy, screen, server, path, nodeClass, drainNode);
+   return t->CreateGLXVideoSourceSGIX(dpy, screen, server, path, nodeClass, drainNode);
 }
 
 void PUBLIC
@@ -658,7 +658,7 @@ glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->DestroyGLXVideoSourceSGIX)(dpy, src);
+   return t->DestroyGLXVideoSourceSGIX(dpy, src);
 }
 
 #endif
@@ -673,7 +673,7 @@ glXFreeContextEXT(Display *dpy, GLXContext context)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->FreeContextEXT)(dpy, context);
+   t->FreeContextEXT(dpy, context);
 }
 
 GLXContextID PUBLIC
@@ -695,7 +695,7 @@ glXImportContextEXT(Display *dpy, GLXContextID contextID)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->ImportContextEXT)(dpy, contextID);
+   return t->ImportContextEXT(dpy, contextID);
 }
 
 int PUBLIC
@@ -705,7 +705,7 @@ glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int *valu
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;  /* XXX ok? */
-   return (t->QueryContextInfoEXT)(dpy, context, attribute, value);
+   return t->QueryContextInfoEXT(dpy, context, attribute, value);
 }
 
 
@@ -719,7 +719,7 @@ glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, in
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->GetFBConfigAttribSGIX)(dpy, config, attribute, value);
+   return t->GetFBConfigAttribSGIX(dpy, config, attribute, value);
 }
 
 GLXFBConfigSGIX PUBLIC *
@@ -729,7 +729,7 @@ glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->ChooseFBConfigSGIX)(dpy, screen, attrib_list, nelements);
+   return t->ChooseFBConfigSGIX(dpy, screen, attrib_list, nelements);
 }
 
 GLXPixmap PUBLIC
@@ -739,7 +739,7 @@ glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pi
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateGLXPixmapWithConfigSGIX)(dpy, config, pixmap);
+   return t->CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap);
 }
 
 GLXContext PUBLIC
@@ -749,7 +749,7 @@ glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateContextWithConfigSGIX)(dpy, config, render_type, share_list, direct);
+   return t->CreateContextWithConfigSGIX(dpy, config, render_type, share_list, direct);
 }
 
 XVisualInfo PUBLIC *
@@ -759,7 +759,7 @@ glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->GetVisualFromFBConfigSGIX)(dpy, config);
+   return t->GetVisualFromFBConfigSGIX(dpy, config);
 }
 
 GLXFBConfigSGIX PUBLIC
@@ -769,7 +769,7 @@ glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->GetFBConfigFromVisualSGIX)(dpy, vis);
+   return t->GetFBConfigFromVisualSGIX(dpy, vis);
 }
 
 
@@ -783,7 +783,7 @@ glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateGLXPbufferSGIX)(dpy, config, width, height, attrib_list);
+   return t->CreateGLXPbufferSGIX(dpy, config, width, height, attrib_list);
 }
 
 void PUBLIC
@@ -793,7 +793,7 @@ glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->DestroyGLXPbufferSGIX)(dpy, pbuf);
+   t->DestroyGLXPbufferSGIX(dpy, pbuf);
 }
 
 int PUBLIC
@@ -803,7 +803,7 @@ glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigne
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->QueryGLXPbufferSGIX)(dpy, pbuf, attribute, value);
+   return t->QueryGLXPbufferSGIX(dpy, pbuf, attribute, value);
 }
 
 void PUBLIC
@@ -813,7 +813,7 @@ glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->SelectEventSGIX)(dpy, drawable, mask);
+   t->SelectEventSGIX(dpy, drawable, mask);
 }
 
 void PUBLIC
@@ -823,7 +823,7 @@ glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->GetSelectedEventSGIX)(dpy, drawable, mask);
+   t->GetSelectedEventSGIX(dpy, drawable, mask);
 }
 
 
@@ -837,7 +837,7 @@ glXCushionSGI(Display *dpy, Window win, float cushion)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->CushionSGI)(dpy, win, cushion);
+   t->CushionSGI(dpy, win, cushion);
 }
 
 
@@ -851,7 +851,7 @@ glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->BindChannelToWindowSGIX)(dpy, screen, channel, window);
+   return t->BindChannelToWindowSGIX(dpy, screen, channel, window);
 }
 
 int PUBLIC
@@ -861,7 +861,7 @@ glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, i
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->ChannelRectSGIX)(dpy, screen, channel, x, y, w, h);
+   return t->ChannelRectSGIX(dpy, screen, channel, x, y, w, h);
 }
 
 int PUBLIC
@@ -871,7 +871,7 @@ glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, i
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->QueryChannelRectSGIX)(dpy, screen, channel, x, y, w, h);
+   return t->QueryChannelRectSGIX(dpy, screen, channel, x, y, w, h);
 }
 
 int PUBLIC
@@ -881,7 +881,7 @@ glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *d
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->QueryChannelDeltasSGIX)(dpy, screen, channel, dx, dy, dw, dh);
+   return t->QueryChannelDeltasSGIX(dpy, screen, channel, dx, dy, dw, dh);
 }
 
 int PUBLIC
@@ -891,7 +891,7 @@ glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype)
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->ChannelRectSyncSGIX)(dpy, screen, channel, synctype);
+   return t->ChannelRectSyncSGIX(dpy, screen, channel, synctype);
 }
 
 
@@ -905,7 +905,7 @@ glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->AssociateDMPbufferSGIX)(dpy, pbuffer, params, dmbuffer);
+   return t->AssociateDMPbufferSGIX(dpy, pbuffer, params, dmbuffer);
 }
 
 #endif
@@ -920,7 +920,7 @@ glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (*t->JoinSwapGroupSGIX)(dpy, drawable, member);
+   t->JoinSwapGroupSGIX(dpy, drawable, member);
 }
 
 
@@ -933,7 +933,7 @@ glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier)
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (*t->BindSwapBarrierSGIX)(dpy, drawable, barrier);
+   t->BindSwapBarrierSGIX(dpy, drawable, barrier);
 }
 
 Bool PUBLIC
@@ -943,7 +943,7 @@ glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (*t->QueryMaxSwapBarriersSGIX)(dpy, screen, max);
+   return t->QueryMaxSwapBarriersSGIX(dpy, screen, max);
 }
 
 
@@ -957,7 +957,7 @@ glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *p
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (*t->GetTransparentIndexSUN)(dpy, overlay, underlay, pTransparent);
+   return t->GetTransparentIndexSUN(dpy, overlay, underlay, pTransparent);
 }
 
 
@@ -971,7 +971,7 @@ glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->CopySubBufferMESA)(dpy, drawable, x, y, width, height);
+   t->CopySubBufferMESA(dpy, drawable, x, y, width, height);
 }
 
 
@@ -985,7 +985,7 @@ glXReleaseBuffersMESA(Display *dpy, Window w)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->ReleaseBuffersMESA)(dpy, w);
+   return t->ReleaseBuffersMESA(dpy, w);
 }
 
 
@@ -999,7 +999,7 @@ glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colorm
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateGLXPixmapMESA)(dpy, visinfo, pixmap, cmap);
+   return t->CreateGLXPixmapMESA(dpy, visinfo, pixmap, cmap);
 }
 
 
@@ -1014,7 +1014,7 @@ glXSet3DfxModeMESA(int mode)
    GET_DISPATCH(dpy, t);
    if (!t)
       return False;
-   return (t->Set3DfxModeMESA)(mode);
+   return t->Set3DfxModeMESA(mode);
 }
 
 
@@ -1032,7 +1032,7 @@ glXAllocateMemoryNV( GLsizei size,
    GET_DISPATCH(dpy, t);
    if (!t)
       return NULL;
-   return (t->AllocateMemoryNV)(size, readFrequency, writeFrequency, priority);
+   return t->AllocateMemoryNV(size, readFrequency, writeFrequency, priority);
 }
 
 
@@ -1044,7 +1044,7 @@ glXFreeMemoryNV( GLvoid *pointer )
    GET_DISPATCH(dpy, t);
    if (!t)
       return;
-   (t->FreeMemoryNV)(pointer);
+   t->FreeMemoryNV(pointer);
 }
 
 
@@ -1060,7 +1060,7 @@ glXGetAGPOffsetMESA( const GLvoid *pointer )
    GET_DISPATCH(dpy, t);
    if (!t)
       return ~0;
-   return (t->GetAGPOffsetMESA)(pointer);
+   return t->GetAGPOffsetMESA(pointer);
 }
 
 
@@ -1387,6 +1387,6 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
    GET_DISPATCH(dpy, t);
    if (!t)
       return 0;
-   return (t->CreateContextAttribs)(dpy, config, share_context, direct,
-                                    attrib_list);
+   return t->CreateContextAttribs(dpy, config, share_context, direct,
+                                  attrib_list);
 }
-- 
2.30.2