From 8ac1ed92aa14baa4577d37c133b9a7feb87ae2a1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 20 Jun 2013 15:47:11 -0700 Subject: [PATCH] i915: Remove various remaining dead code. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/intel_context.h | 4 ---- src/mesa/drivers/dri/i915/intel_fbo.h | 1 - src/mesa/drivers/dri/i915/intel_screen.h | 5 ----- 3 files changed, 10 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index b44e7f675cd..84bb8be80ef 100644 --- 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 9b11a074af1..bd0aae01895 100644 --- 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 f7b1e982888..a0ff0e07445 100644 --- 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 */ -- 2.30.2