Mesa (staging/19.1): glx: fix glvnd pointer types

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: c36e4bd7fa9cca86beccb978089c925b00ff640d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c36e4bd7fa9cca86beccb978089c925b00ff640d

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Fri Jun 14 15:15:10 2019 +0100

glx: fix glvnd pointer types

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110709
Fixes: 22a9e00aab66d3dd6890 ("glx: Implement the libglvnd interface.")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 65b016b1469574ab2e3b4d2c2706fd96c995fa9f)

---

 src/glx/g_glxglvnddispatchfuncs.c | 4 ++--
 src/glx/glxglvnd.c                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/g_glxglvnddispatchfuncs.c b/src/glx/g_glxglvnddispatchfuncs.c
index 5b65afc8602..cec52c554e6 100644
--- a/src/glx/g_glxglvnddispatchfuncs.c
+++ b/src/glx/g_glxglvnddispatchfuncs.c
@@ -128,7 +128,7 @@ static void dispatch_BindTexImageEXT(Display *dpy, GLXDrawable drawable,
 
 
 static GLXFBConfigSGIX *dispatch_ChooseFBConfigSGIX(Display *dpy, int screen,
-                                                    const int *attrib_list,
+                                                    int *attrib_list,
                                                     int *nelements)
 {
     PFNGLXCHOOSEFBCONFIGSGIXPROC pChooseFBConfigSGIX;
@@ -220,7 +220,7 @@ static GLXPbuffer dispatch_CreateGLXPbufferSGIX(Display *dpy,
                                                 GLXFBConfig config,
                                                 unsigned int width,
                                                 unsigned int height,
-                                                const int *attrib_list)
+                                                int *attrib_list)
 {
     PFNGLXCREATEGLXPBUFFERSGIXPROC pCreateGLXPbufferSGIX;
     __GLXvendorInfo *dd;
diff --git a/src/glx/glxglvnd.c b/src/glx/glxglvnd.c
index b6b415114c9..bf5c2a06b0c 100644
--- a/src/glx/glxglvnd.c
+++ b/src/glx/glxglvnd.c
@@ -41,7 +41,7 @@ static void *__glXGLVNDGetDispatchAddress(const GLubyte *procName)
 {
     unsigned internalIndex = FindGLXFunction(procName);
 
-    return __glXDispatchFunctions[internalIndex];
+    return (void*)__glXDispatchFunctions[internalIndex];
 }
 
 static void __glXGLVNDSetDispatchIndex(const GLubyte *procName, int index)