From 7ce12b0863f1cc03bdd7c65c0c0733b2ff903e40 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 9 Jan 2008 12:41:14 -0800 Subject: [PATCH] [intel] Remove the dead intel->need_flush member. --- src/mesa/drivers/dri/i915/intel_pixel_bitmap.c | 1 - src/mesa/drivers/dri/i965/brw_draw.c | 3 +-- src/mesa/drivers/dri/i965/intel_context.c | 1 - src/mesa/drivers/dri/i965/intel_context.h | 1 - src/mesa/drivers/dri/i965/intel_pixel_copy.c | 1 - src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c index 65bf338589e..066d5b1fd4f 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c @@ -292,7 +292,6 @@ x if (ctx->Scissor.Enabled) } } } - intel->need_flush = GL_TRUE; out: intel_batchbuffer_flush(intel->batch); } diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index eeba8e0a176..72ed7cdea31 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -346,8 +346,7 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx, } } } - - intel->need_flush = GL_TRUE; + retval = GL_TRUE; } diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c index 0866c5ccc6e..abcd6d5aabe 100644 --- a/src/mesa/drivers/dri/i965/intel_context.c +++ b/src/mesa/drivers/dri/i965/intel_context.c @@ -746,7 +746,6 @@ static void intelContendedLock( struct intel_context *intel, GLuint flags ) intel->locked = 1; - intel->need_flush = 1; /* Lost context? */ diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h index 52fee68d1a0..accb3069f02 100644 --- a/src/mesa/drivers/dri/i965/intel_context.h +++ b/src/mesa/drivers/dri/i965/intel_context.h @@ -176,7 +176,6 @@ struct intel_context GLboolean no_rast; GLboolean locked; GLboolean strict_conformance; - GLboolean need_flush; /* State for intelvb.c and inteltris.c. */ diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c index 7583906dd09..70da03da09e 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c @@ -315,7 +315,6 @@ do_blit_copypixels(GLcontext * ctx, ctx->Color.LogicOp : GL_COPY); } - intel->need_flush = GL_TRUE; out: intel_batchbuffer_flush(intel->batch); } diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 3777422619b..05b5a44beaa 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -299,7 +299,6 @@ do_blit_bitmap( GLcontext *ctx, } } } - intel->need_flush = GL_TRUE; out: intel_batchbuffer_flush(intel->batch); } -- 2.30.2