From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 28 Jul 2005 23:33:18 +0000 (+0000)
Subject: Use the routines supplied in the __DRIinterfaceMethods structure to create a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82e3ecf413704440ea64b3b582d68f82f7b83704;p=mesa.git

Use the routines supplied in the __DRIinterfaceMethods structure to create a
destroy __GLcontextModes structures.  This eliminates the need for DRI
drivers to ever link with glcontextmodes.c.
---

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 8182ae2da9a..0880e73caf9 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -10,8 +10,7 @@ COMMON_SOURCES = \
         ../common/vblank.c \
         ../common/dri_util.c \
         ../common/xmlconfig.c \
-        ../common/drirenderbuffer.c \
-        ../common/glcontextmodes.c
+        ../common/drirenderbuffer.c
 
 ifeq ($(WINDOW_SYSTEM),dri)
 WINOBJ=../dri_client/dri.a
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index c201d44c6c6..4bb64c53f87 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -31,7 +31,6 @@
 
 #include "dri_util.h"
 #include "drm_sarea.h"
-#include "glcontextmodes.h"
 
 #ifndef GLX_OML_sync_control
 typedef GLboolean ( * PFNGLXGETMSCRATEOMLPROC) (__DRInativeDisplay *dpy, __DRIid drawable, int32_t *numerator, int32_t *denominator);
@@ -836,7 +835,7 @@ static void driDestroyScreen(__DRInativeDisplay *dpy, int scrn, void *screenPriv
 	_mesa_free(psp->pDevPriv);
 	(void)drmClose(psp->fd);
 	if ( psp->modes != NULL ) {
-	    _gl_context_modes_destroy( psp->modes );
+	    (*dri_interface->destroyContextModes)( psp->modes );
 	}
 	_mesa_free(psp);
     }
diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 42197324744..57c7fc7aa95 100644
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -16,8 +16,7 @@ COMMON_SOURCES = \
 	../common/texmem.c \
 	../common/vblank.c \
 	../common/xmlconfig.c \
-	../common/dri_util.c \
-	../common/glcontextmodes.c
+	../common/dri_util.c
 
 DRIVER_SOURCES = \
 		 radeon_screen.c \