i965: Fix all non-snb regression in the snb attribute interpolation commit.

[mesa.git] / src / mesa / drivers / dri / tdfx / tdfx_screen.h

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.h b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
index 3faeb84e7520762cb96de383b12fcb05f72dfb4f..6aa42e866740386981f7c3b6a31a59f558e559f7 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
@@ -23,7 +23,6 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfx_screen.h,v 1.2 2002/02/22 21:45:03 dawes Exp $ */
 
 /*
  * Original rewrite:
@@ -37,8 +36,6 @@
 #ifndef __TDFX_SCREEN_H__
 #define __TDFX_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 typedef struct {
    drm_handle_t handle;
    drmSize size;
@@ -64,10 +61,12 @@ typedef struct {
    int textureOffset;
    int textureSize;
 
-   __DRIscreenPrivate *driScrnPriv;
+   __DRIscreen *driScrnPriv;
    unsigned int sarea_priv_offset;
+
+   /* Configuration cache with default values for all contexts */
+   driOptionCache optionCache;
 } tdfxScreenPrivate;
 
 
 #endif
-#endif