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.

1 files changed, 0 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/common/vblank.c b/src/mesa/drivers/dri/common/vblank.c
index d20f743bc9..aaeaebb036 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 );