remove some more old stuff

diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.c b/src/mesa/drivers/dri/i915tex/intel_screen.c
index 4cabc222251bf9d7436ac31864795c12deae2a8f..0b9ba7eda73f331eca1255b85603e90ec496e1fb 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/intel_screen.c
+++ b/src/mesa/drivers/dri/i915tex/intel_screen.c
@@ -310,10 +310,8 @@ intelInitDriver(__DRIscreenPrivate * sPriv)
 
    switch (gDRIPriv->bitsPerPixel) {
    case 16:
-      intelScreen->fbFormat = DV_PF_565;
       break;
    case 32:
-      intelScreen->fbFormat = DV_PF_8888;
       break;
    default:
       exit(1);

diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.h b/src/mesa/drivers/dri/i915tex/intel_screen.h
index 9a5e3ac76e2c81020b91223140ebf8de0a1aa522..8e4e0b9c12f560cd585fc0fb130e66f76eceabe7 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/intel_screen.h
+++ b/src/mesa/drivers/dri/i915tex/intel_screen.h
@@ -59,10 +59,6 @@ typedef struct
    int mem;                     /* unused */
 
    int cpp;                     /* for front and back buffers */
-/*    int bitsPerPixel;   */
-   int fbFormat;                /* XXX FBO: this is obsolete - remove after i830 updates */
-
-   int logTextureGranularity;
 
    __DRIscreenPrivate *driScrnPriv;
    unsigned int sarea_priv_offset;