From: Kenneth Graunke Date: Fri, 27 Sep 2013 22:29:00 +0000 (-0700) Subject: i965: Move need_workaround_flush = true to intel_batchbuffer_init. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50c9f04c5f5700ac27f8552694d2a2f2ab6fe89f;p=mesa.git i965: Move need_workaround_flush = true to intel_batchbuffer_init. intel_batchbuffer_init() sets up initial batchbuffer state; it seems like a reasonable place to initialize this flag. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 177bda009f9..ec3a750e87f 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -647,8 +647,6 @@ brwCreateContext(gl_api api, brw->curbe.next_buf = calloc(1, 4096); } - brw->batch.need_workaround_flush = true; - ctx->VertexProgram._MaintainTnlProgram = true; ctx->FragmentProgram._MaintainTexEnvProgram = true; diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 0aa2551c95c..77f3ada0f68 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -70,6 +70,8 @@ intel_batchbuffer_init(struct brw_context *brw) 4096, 4096); } + brw->batch.need_workaround_flush = true; + if (!brw->has_llc) { brw->batch.cpu_map = malloc(BATCH_SZ); brw->batch.map = brw->batch.cpu_map;