intel: Drop little bits of dead code.

I noticed these while building the fork-i915 branch.

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

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 126094b591b6117168a2e5a72214a3b16700a8a8..02b225b2e6e0134866bea769e3e705a700375e54 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -94,8 +94,6 @@ static void intel_start_inline(struct intel_context *intel, uint32_t prim)
 
    intel->no_batch_wrap = true;
 
-   /*printf("%s *", __progname);*/
-
    /* Emit a slot which will be filled with the inline primitive
     * command later.
     */

diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index 0f1a0c79e03b67d0f8a33f0201871263f192b032..84452b941c8942df27b720d3d00224a19310f3e9 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -359,9 +359,6 @@ struct intel_context
    driOptionCache optionCache;
 };
 
-extern char *__progname;
-
-
 #define SUBPIXEL_X 0.125
 #define SUBPIXEL_Y 0.125
 

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.h b/src/mesa/drivers/dri/intel/intel_fbo.h
index e1b4df567db7383a477f958504e8e38f72f4768d..5f40d352836e85511e744b081700a2a51a435542 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_fbo.h
+++ b/src/mesa/drivers/dri/intel/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/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
index 48339373e469148fcd7aeb0fb6e1a63f23d5a3fc..188e2c09c99b1f67d22accab238952f1dea99f49 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -45,12 +45,9 @@ struct intel_screen
    int max_gl_es1_version;
    int max_gl_es2_version;
 
-   int logTextureGranularity;
-
    __DRIscreen *driScrnPriv;
 
    bool no_hw;
-   GLuint relaxed_relocations;
 
    /*
     * The hardware hiz and separate stencil fields are needed in intel_screen,
@@ -77,8 +74,6 @@ struct intel_screen
    driOptionCache optionCache;
 };
 
-extern bool intelMapScreenRegions(__DRIscreen * sPriv);
-
 extern void intelDestroyContext(__DRIcontext * driContextPriv);
 
 extern GLboolean intelUnbindContext(__DRIcontext * driContextPriv);

diff --git a/src/mesa/drivers/dri/intel/intel_tex_obj.h b/src/mesa/drivers/dri/intel/intel_tex_obj.h
index 8c166b4021925e1f4713334b89be550f0e5c4594..e30dd8ae7a3f9b748c37ed3075d551d8fdd0c79f 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex_obj.h
+++ b/src/mesa/drivers/dri/intel/intel_tex_obj.h
@@ -41,10 +41,6 @@ struct intel_texture_object
     */
    unsigned int _MaxLevel;
 
-   /* Offset for firstLevel image:
-    */
-   GLuint textureOffset;
-
    /* On validation any active images held in main memory or in other
     * regions will be copied to this region and the old storage freed.
     */