From 2d3e0cdf4bd7ab069bad7244ede7c2d489e92b17 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:39:56 -0500
Subject: [PATCH] Revert "registry: Register APPLEDRI extension protocol
 names."

This reverts commit 3464b419230c6d17e940d967b567c5d2cb22d232.

Moving all the names into dix/registry.c
---
 hw/darwin/quartz/xpr/appledri.c | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index d9690fdb1c..70b7400773 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -53,7 +53,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "swaprep.h"
 #include "dri.h"
 #include "dristruct.h"
-#include "registry.h"
 
 static int DRIErrorBase = 0;
 
@@ -93,33 +92,7 @@ AppleDRIExtensionInit(void)
         DRIErrorBase = extEntry->errorBase;
         DRIEventBase = extEntry->eventBase;
         EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
-    } else
-	return;
-
-    RegisterRequestName(DRIReqCode, X_AppleDRIQueryVersion,
-			APPLEDRINAME ":QueryVersion");
-    RegisterRequestName(DRIReqCode, X_AppleDRIQueryDirectRenderingCapable,
-			APPLEDRINAME ":QueryDirectRenderingCapable");
-    RegisterRequestName(DRIReqCode, X_AppleDRICreateSurface,
-			APPLEDRINAME ":CreateSurface");
-    RegisterRequestName(DRIReqCode, X_AppleDRIDestroySurface,
-			APPLEDRINAME ":DestroySurface");
-    RegisterRequestName(DRIReqCode, X_AppleDRIAuthConnection,
-			APPLEDRINAME ":AuthConnection");
-
-    RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent1,
-		      APPLEDRINAME ":ObsoleteEvent1");
-    RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent2,
-		      APPLEDRINAME ":ObsoleteEvent2");
-    RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent3,
-		      APPLEDRINAME ":ObsoleteEvent3");
-    RegisterEventName(DRIEventBase + AppleDRISurfaceNotify,
-		      APPLEDRINAME ":SurfaceNotify");
-
-    RegisterErrorName(DRIEventBase + AppleDRIClientNotLocal,
-		      APPLEDRINAME ":ClientNotLocal");
-    RegisterErrorName(DRIEventBase + AppleDRIOperationNotSupported,
-		      APPLEDRINAME ":OperationNotSupported");
+    }
 }
 
 /*ARGSUSED*/