summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i915/intel_pixel_bitmap.c1
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw.c3
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.c1
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.h1
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_copy.c1
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_bitmap.c1
6 files changed, 1 insertions, 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 65bf338589..066d5b1fd4 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 eeba8e0a17..72ed7cdea3 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 0866c5ccc6..abcd6d5aab 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 52fee68d1a..accb3069f0 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 7583906dd0..70da03da09 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 3777422619..05b5a44bea 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);
}