i915: Remove various remaining dead code.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index b44e7f675cd5add15c5ac1d33100ed8918fe4d74..84bb8be80ef0c7cd1bf612200add7cc1882b4388 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -114,8 +114,6 @@ struct intel_sync_object {
    drm_intel_bo *bo;
 };
 
-struct brw_context;
-
 struct intel_batchbuffer {
    /** Current batchbuffer being queued up. */
    drm_intel_bo *bo;
@@ -219,8 +217,6 @@ struct intel_context
 
    uint32_t max_gtt_map_object_size;
 
-   GLuint stats_wm;
-
    /* Offsets of fields within the current vertex:
     */
    GLuint coloroffset;

diff --git a/src/mesa/drivers/dri/i915/intel_fbo.h b/src/mesa/drivers/dri/i915/intel_fbo.h
index 9b11a074af16115e50e009631646b1d20497496e..bd0aae01895c495205264b50b970c6c94a646b5f 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_fbo.h
+++ b/src/mesa/drivers/dri/i915/intel_fbo.h
@@ -51,7 +51,6 @@ struct intel_renderbuffer
 {
    struct swrast_renderbuffer Base;
    struct intel_mipmap_tree *mt; /**< The renderbuffer storage. */
-   drm_intel_bo *map_bo;
 
    /**
     * \name Miptree view

diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h
index f7b1e982888bd2526b369869b30496cddf2d79b0..a0ff0e07445b26d321bcd6df84191e444fbc4a2d 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.h
+++ b/src/mesa/drivers/dri/i915/intel_screen.h
@@ -54,11 +54,6 @@ struct intel_screen
    bool no_vbo;
    dri_bufmgr *bufmgr;
 
-   /**
-    * A unique ID for shader programs.
-    */
-   unsigned program_id;
-
    /**
    * Configuration cache with default values for all contexts
    */