i965: Remove bad constant buffer constant-reg-already-loaded optimization.

[mesa.git] / src / mesa / drivers / dri / r128 / r128_screen.h

diff --git a/src/mesa/drivers/dri/r128/r128_screen.h b/src/mesa/drivers/dri/r128/r128_screen.h
index 1fac0a7f49514735197af0890e90904981950739..e2fa1677c9fa5064bf47cd1baa787173c973dbd6 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_screen.h
+++ b/src/mesa/drivers/dri/r128/r128_screen.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_screen.h,v 1.7 2002/12/16 16:18:53 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -36,12 +35,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R128_SCREEN_H__
 #define __R128_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 #include "xmlconfig.h"
 
 typedef struct {
-   drmHandle handle;                   /* Handle to the DRM region */
+   drm_handle_t handle;                        /* Handle to the DRM region */
    drmSize size;                       /* Size of the DRM region */
    unsigned char *map;                 /* Mapping of the DRM region */
 } r128RegionRec, *r128RegionPtr;
@@ -80,8 +77,9 @@ typedef struct {
    /* Configuration cache with default values for all contexts */
    driOptionCache optionCache;
 
+   const __DRIextension *extensions[4];
+
 } r128ScreenRec, *r128ScreenPtr;
 
 
-#endif
 #endif /* __R128_SCREEN_H__ */