From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 11 Feb 2010 21:47:46 +0000 (-0500)
Subject: i915: Remove a few DRI1 era struct intel_screen fields
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9b0f04b1f3ba4765733fcbb91a7cc314bf83e5c;p=mesa.git

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 dd5cf10b690..221e40c0a5b 100644
--- 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 4117d49e423..4c9579afa71 100644
--- 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;