Mesa (master): i915: Remove a few DRI1 era struct intel_screen fields

Kristian Høgsberg krh at kemper.freedesktop.org
Thu Feb 11 21:59:31 UTC 2010


Module: Mesa
Branch: master
Commit: c9b0f04b1f3ba4765733fcbb91a7cc314bf83e5c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9b0f04b1f3ba4765733fcbb91a7cc314bf83e5c

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Thu Feb 11 16:47:46 2010 -0500

i915: Remove a few DRI1 era struct intel_screen fields

---

 src/mesa/drivers/dri/intel/intel_screen.c |    2 --
 src/mesa/drivers/dri/intel/intel_screen.h |    7 -------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index dd5cf10..221e40c 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 4117d49..4c9579a 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;




More information about the mesa-commit mailing list