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.

3 files changed, 2 insertions, 23 deletions

diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 83d5a8ff326..99dc064826a 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -32,7 +32,7 @@
 #include "extensions.h"
 #include "utils.h"
 
-#if !defined( DRI_NEW_INTERFACE_ONLY ) && !defined( _SOLO )
+#if !defined( DRI_NEW_INTERFACE_ONLY )
 #include "xf86dri.h"        /* For XF86DRIQueryVersion prototype. */
 #endif
 
@@ -171,7 +171,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv,
        "but got version %d.%d.%d";
    int major, minor, patch;
 
-#ifndef _SOLO
    /* Check the DRI version */
    if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) {
       if (major != dri_major || minor < dri_minor) {
@@ -187,9 +186,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv,
 		       sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch);
       return GL_FALSE;
    }
-#else
-   (void)major;(void)minor;(void)patch;
-#endif
    
    /* Check that the DRM driver version is compatible */
    if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) {
diff --git a/src/mesa/drivers/dri/common/vblank.c b/src/mesa/drivers/dri/common/vblank.c
index d20f743bc9a..aaeaebb0362 100644
--- a/src/mesa/drivers/dri/common/vblank.c
+++ b/src/mesa/drivers/dri/common/vblank.c
@@ -128,11 +128,7 @@ int driWaitForMSC32( __DRIdrawablePrivate *priv,
 	 if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
 	    /* FIXME: This doesn't seem like the right thing to return here.
 	     */
-#ifndef _SOLO	     
 	    return GLX_BAD_CONTEXT;
-#else
-	    return -1;
-#endif
 	 }
 
          dont_wait = 0;
@@ -163,11 +159,7 @@ int driWaitForMSC32( __DRIdrawablePrivate *priv,
       if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) {
 	 /* FIXME: This doesn't seem like the right thing to return here.
 	  */
-#ifndef _SOLO
 	 return GLX_BAD_CONTEXT;
-#else
-	 return -1;
-#endif
       }
    }
 
@@ -226,11 +218,9 @@ GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache )
 
 void driDrawableInitVBlank( __DRIdrawablePrivate *priv, GLuint flags )
 {
-#ifndef _SOLO
    if ( priv->pdraw->swap_interval == (unsigned)-1 ) {
       priv->pdraw->swap_interval = (flags & VBLANK_FLAG_THROTTLE) != 0 ? 1 : 0;
    }
-#endif   
 }
 
 
@@ -328,11 +318,7 @@ driWaitForVBlank( const  __DRIdrawablePrivate *priv, GLuint * vbl_seq,
    vbl.request.type = DRM_VBLANK_ABSOLUTE;
 
    if ( (flags & VBLANK_FLAG_INTERVAL) != 0 ) {
-#ifndef _SOLO   
       interval = priv->pdraw->swap_interval;
-#else
-      interval = 0;
-#endif      
       /* this must have been initialized when the drawable was first bound
        * to a direct rendering context. */
       assert ( interval != (unsigned)-1 );
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index f5e07de4ede..698abd8fca0 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -34,6 +34,7 @@
 #include <expat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#define __USE_GNU /* defines program_invocation_short_name */
 #include <errno.h>
 #include "imports.h"
 #include "dri_util.h"
@@ -900,11 +901,7 @@ void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info,
     userData.cache = cache;
     userData.screenNum = screenNum;
     userData.driverName = driverName;
-#ifndef _SOLO    
     userData.execName = GET_PROGRAM_NAME();
-#else
-    userData.execName = "Solo";
-#endif    
 
     if ((home = getenv ("HOME"))) {
 	GLuint len = strlen (home);