From 234b5f23f8047a837b8236e58301ad60fe63902b Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Fri, 22 Apr 2016 13:43:39 +0300 Subject: [PATCH] i965/blorp: Use BRW_NEW_BLORP instead of trashing all state bits Signed-off-by: Topi Pohjolainen Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_blorp.cpp | 4 +--- src/mesa/drivers/dri/i965/gen7_urb.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp index ce09b099005..76c9fbe9661 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp @@ -284,12 +284,10 @@ retry: if (unlikely(brw->always_flush_batch)) intel_batchbuffer_flush(brw); - const uint64_t do_not_smash_bits = BRW_NEW_URB_SIZE; - /* We've smashed all state compared to what the normal 3D pipeline * rendering tracks for GL. */ - brw->ctx.NewDriverState |= ~do_not_smash_bits; + brw->ctx.NewDriverState |= BRW_NEW_BLORP; brw->no_depth_or_stencil = false; brw->ib.type = -1; diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c index 3f731df87c4..a412a4263b3 100644 --- a/src/mesa/drivers/dri/i965/gen7_urb.c +++ b/src/mesa/drivers/dri/i965/gen7_urb.c @@ -418,8 +418,7 @@ gen7_emit_urb_state(struct brw_context *brw, const struct brw_tracked_state gen7_urb = { .dirty = { .mesa = 0, - .brw = BRW_NEW_BLORP | - BRW_NEW_CONTEXT | + .brw = BRW_NEW_CONTEXT | BRW_NEW_URB_SIZE | BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_TESS_PROGRAMS | -- 2.30.2