summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-06-21 10:43:32 -0700
committerEric Anholt <[email protected]>2013-06-26 01:07:12 -0700
commit57407bcaf8b0ee249a64b25483dcd1fc1268cf5c (patch)
treee187cd934c8994c48fd5f145e567c440bef84e2e /src/mesa
parent88514d922e4e392ec82ea8ab2ecb5bf0d2317c4f (diff)
intel: Drop little bits of dead code.
I noticed these while building the fork-i915 branch. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i915/intel_tris.c2
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.h3
-rw-r--r--src/mesa/drivers/dri/intel/intel_fbo.h1
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.h5
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_obj.h4
5 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 126094b591b..02b225b2e6e 100644
--- 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 0f1a0c79e03..84452b941c8 100644
--- 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 e1b4df567db..5f40d352836 100644
--- 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 48339373e46..188e2c09c99 100644
--- 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 8c166b40219..e30dd8ae7a3 100644
--- 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.
*/