xserver: Branch 'master' - 2 commits

[Tilman Sauerbeck]

 GL/glx/glxdri.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

New commits:
diff-tree 767f372dd02232469f9fd804b811a17eaf762e1e (from parents)
Merge: c4f5de6cc3b935025829af971b0b8010c1ecfedb 462bb61b0fe968fae1b99cf98ec6f7de09105dcd
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Wed Aug 9 20:23:30 2006 +0200

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

diff-tree c4f5de6cc3b935025829af971b0b8010c1ecfedb (from 12dbd8a02f797ad57a1be683a02a1fcb1ca35438)
Author: Tilman Sauerbeck <tilman at code-monkey.de>
Date:   Wed Aug 9 20:21:52 2006 +0200

    Sanitized glxdri's Block/Wakeuphandler calling.
    
    __glXDRIleaveServer() and _enterServer() used to call DRIDoBlockHandler
    (resp DRIDoWakeupHandler) directly. They are now calling DRIBlockHandler
    (resp DRIWakeupHandler) to account for driver specific block/wakeup
    hooks.

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 6a10554..cfa9996 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -137,19 +137,13 @@ static const char CREATE_NEW_SCREEN_FUNC
 static void
 __glXDRIleaveServer(void)
 {
-  int i;
-
-  for (i = 0; i < screenInfo.numScreens; i++)
-    DRIDoBlockHandler(i, NULL, NULL, NULL);
+  DRIBlockHandler(NULL, NULL, NULL);
 }
     
 static void
 __glXDRIenterServer(void)
 {
-  int i;
-
-  for (i = 0; i < screenInfo.numScreens; i++)
-    DRIDoWakeupHandler(i, NULL, 0, NULL);
+  DRIWakeupHandler(NULL, 0, NULL);
 }
 
 static void