xserver: Branch 'master'

[Dodji Seketeli]

 exa/exa.c |   48 ------------------------------------------------
 1 file changed, 48 deletions(-)

New commits:
diff-tree 6aab6a6e2ae0ef5fdedae09cf2cdc86f382e3a8a (from 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8)
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Mon Oct 8 13:25:38 2007 +0200

    EXA: dude, don't validation driver hooks twice !

diff --git a/exa/exa.c b/exa/exa.c
index 1403d4f..7ad226f 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -722,48 +722,6 @@ exaDriverAlloc(void)
     return xcalloc(1, sizeof(ExaDriverRec));
 }
 
-static Bool
-exaDriverValidateEntryPoints (ExaDriverPtr  pExaDriver)
-{
-    Bool res=TRUE ;
-
-    if (!pExaDriver)
-        return FALSE ;
-
-    if (!pExaDriver->memoryBase) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::memoryBase member "
-                   "must be assigned to a value different from zero\n") ;
-        res = FALSE ;
-    }
-    if (!pExaDriver->memorySize) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::memorySize member must be different from zero\n") ;
-        res = FALSE ;
-    }
-    if (pExaDriver->offScreenBase > pExaDriver->memorySize) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::ffscreenBase must be <= pExaDriver->memorySize member\n") ;
-        res = FALSE ;
-    }
-    if (!pExaDriver->PrepareSolid) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::PrepareSolid member is required to be non NULL\n") ;
-        res = FALSE ;
-    }
-    if (!pExaDriver->PrepareCopy) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::PrepareCopy member is required to be non NULL\n") ;
-        res = FALSE ;
-    }
-    if (!pExaDriver->WaitMarker) {
-        LogMessage(X_ERROR,
-                   "Exa: Exa::WaitWarker member is required to be non NULL\n") ;
-        res = FALSE ;
-    }
-    return res ;
-}
-
 /**
  * @param pScreen screen being initialized
  * @param pScreenInfo EXA driver record
@@ -848,12 +806,6 @@ exaDriverInit (ScreenPtr		pScreen,
     {
         pScreenInfo->maxPitchPixels = pScreenInfo->maxX;
     }
-    if (!exaDriverValidateEntryPoints(pScreenInfo))
-    {
-	LogMessage(X_ERROR, "Exa(%d): EXA driver entry points validation failed\n",
-		   pScreen->myNum) ;
-	return FALSE ;
-    }
 
 #ifdef RENDER
     ps = GetPictureScreenIfSet(pScreen);