i915: Remove a few DRI1 era struct intel_screen fields

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index dd5cf10b690e2e67c759e7f2577f93cba1baab79..221e40c0a5ba3e8682f29b6df6d4e933f3d05ea8 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -360,8 +360,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
    intelScreen->driScrnPriv = psp;
    psp->private = (void *) intelScreen;
 
-   intelScreen->drmMinor = psp->drm_version.minor;
-
    /* Determine chipset ID */
    if (!intel_get_param(psp, I915_PARAM_CHIPSET_ID,
                        &intelScreen->deviceID))

diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
index 4117d49e4237dffed8d1dba8276e1d3eb70125f8..4c9579afa717c8332e31a8ba9f699bd3ef217da6 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -37,18 +37,11 @@
 struct intel_screen
 {
    int deviceID;
-   int width;
-   int height;
-   int pitch;                   /* common row stride, in pixels */
 
    int logTextureGranularity;
 
    __DRIscreen *driScrnPriv;
 
-   volatile drm_i915_sarea_t *sarea;
-
-   int drmMinor;
-
    int irq_active;
 
    GLboolean no_hw;