From aaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 Mon Sep 17 00:00:00 2001
From: Jon Smirl <jonsmirl@gmail.com>
Date: Sun, 4 Jul 2004 20:33:48 +0000
Subject: Patch removes _SOLO definition needed for mesa-solo. mesa-solo uses
 the NEW_INTERFACE now so _SOLO isn't necessary anymore. Tested with the
 hardware that I own.

---
 src/mesa/drivers/dri/unichrome/via_context.c |  5 -----
 src/mesa/drivers/dri/unichrome/via_context.h |  8 +-------
 src/mesa/drivers/dri/unichrome/via_screen.c  | 10 ----------
 3 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/mesa/drivers/dri/unichrome')

diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index b349a5b63f..a496380c79 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -56,9 +56,6 @@
 #include "via_ioctl.h"
 #include "via_fb.h"
 
-#ifndef _SOLO
-#include <X11/Xlibint.h>
-#endif
 #include <stdio.h>
 #include "macros.h"
 
@@ -482,10 +479,8 @@ viaCreateContext(const __GLcontextModes *mesaVis,
     _tnl_allow_pixel_fog(ctx, GL_FALSE);
     _tnl_allow_vertex_fog(ctx, GL_TRUE);
 
-#ifndef _SOLO
 /*     vmesa->display = dpy; */
     vmesa->display = sPriv->display;
-#endif
     
     vmesa->hHWContext = driContextPriv->hHWContext;
     vmesa->driFd = sPriv->fd;
diff --git a/src/mesa/drivers/dri/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h
index fe26ff80d3..4ac3a8cfa6 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.h
+++ b/src/mesa/drivers/dri/unichrome/via_context.h
@@ -32,10 +32,6 @@ typedef struct via_texture_object_t *viaTextureObjectPtr;
 
 #include "dri_util.h"
 
-#ifndef _SOLO
-#include <X11/Xlibint.h>
-#endif
-
 #include "mtypes.h"
 #include "drm.h"
 #include "mm.h"
@@ -291,9 +287,7 @@ struct via_context_t {
     drm_context_t hHWContext;
     drm_hw_lock_t *driHwLock;
     int driFd;
-#ifndef _SOLO
-    Display *display;
-#endif
+    __DRInativeDisplay *display;
 
     __DRIdrawablePrivate *driDrawable;
     __DRIscreenPrivate *driScreen;
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index b0d4c57ec0..242348a953 100644
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -291,7 +291,6 @@ static struct __DriverAPIRec viaAPI = {
  * Return:  pointer to a __DRIscreenPrivate.
  */
 #if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO
 void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
                         int numConfigs, __GLXvisualConfig *config)
 {
@@ -299,15 +298,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
     psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &viaAPI);
     return (void *)psp;
 }
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
-                        struct DRIDriverContextRec *driverContext)
-{
-    __DRIscreenPrivate *psp;
-    psp = __driUtilCreateScreen(driver, driverContext, &viaAPI);
-    return (void *) psp;
-}
-#endif
 #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */
 
 
-- 
cgit v1.2.3