From: Kristian Høgsberg <krh@hinata.boston.redhat.com>
Date: Thu, 17 May 2007 20:11:19 +0000 (-0400)
Subject: Convert a left-over private void * to __DRIcontext *.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ecdb45cb29e3209287cc297081596126e955ff2b;p=mesa.git

Convert a left-over private void * to __DRIcontext *.
---

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 657e3828cca..46f1f441d01 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -377,7 +377,7 @@ struct __DRIscreenRec {
     void * (*createNewContext)(__DRIscreen *screen,
 			       const __GLcontextModes *modes,
 			       int render_type,
-			       void *sharedPrivate,
+			       __DRIcontext *shared,
 			       drm_context_t hwContext, __DRIcontext *pctx);
 
     /**
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index a680c646d95..0a49e945863 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -395,8 +395,8 @@ CreateContext(Display *dpy, XVisualInfo *vis,
 	    }
 
 	    if (psc && psc->driScreen.private) {
-		void * const shared = (shareList != NULL)
-		    ? shareList->driContext.private : NULL;
+		__DRIcontext *shared = (shareList != NULL)
+		    ? &shareList->driContext : NULL;
 
 
 		if (!XF86DRICreateContextWithConfig(dpy, psc->scr,
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index b88592313ed..20fee27f0a2 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -553,7 +553,7 @@ driDestroyContext(__DRIcontext *context)
  * \param modes         Mode used to create the new context.
  * \param render_type   Type of rendering target.  \c GLX_RGBA is the only
  *                      type likely to ever be supported for direct-rendering.
- * \param sharedPrivate The shared context dependent methods or \c NULL if
+ * \param shared        The shared context dependent methods or \c NULL if
  *                      non-existent.
  * \param pctx          DRI context to receive the context dependent methods.
  *
@@ -569,11 +569,11 @@ driDestroyContext(__DRIcontext *context)
  */
 static void *
 driCreateNewContext(__DRIscreen *screen, const __GLcontextModes *modes,
-		    int render_type, void *sharedPrivate, 
+		    int render_type, __DRIcontext *shared, 
 		    drm_context_t hwContext, __DRIcontext *pctx)
 {
     __DRIcontextPrivate *pcp;
-    __DRIcontextPrivate *pshare = (__DRIcontextPrivate *) sharedPrivate;
+    __DRIcontextPrivate *pshare = (shared != NULL) ? shared->private : NULL;
     __DRIscreenPrivate *psp;
     void * const shareCtx = (pshare != NULL) ? pshare->driverPrivate : NULL;