From: Topi Pohjolainen Date: Fri, 6 Mar 2015 13:55:02 +0000 (+0200) Subject: i965/blorp/gen7: Prepare re-using for gen8 X-Git-Tag: upstream/17.1.0~10849 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e04b3cdf33f6fdb363c652e935d8a0b427ef6b15;p=platform%2Fupstream%2Fmesa.git i965/blorp/gen7: Prepare re-using for gen8 Signed-off-by: Topi Pohjolainen Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index eae1e30..4debeb3 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -47,7 +47,9 @@ static void gen7_blorp_emit_urb_config(struct brw_context *brw) { - unsigned urb_size = (brw->is_haswell && brw->gt == 3) ? 32 : 16; + const unsigned urb_size = + (brw->gen >= 8 || (brw->is_haswell && brw->gt == 3)) ? 32 : 16; + gen7_emit_push_constant_state(brw, urb_size / 2 /* vs_size */, 0 /* hs_size */, @@ -348,7 +350,7 @@ gen7_blorp_emit_gs_disable(struct brw_context *brw) * whole fixed function pipeline" means to emit a PIPE_CONTROL with the "CS * Stall" bit set. */ - if (!brw->is_haswell && brw->gt == 2 && brw->gs.enabled) + if (brw->gen < 8 && !brw->is_haswell && brw->gt == 2 && brw->gs.enabled) gen7_emit_cs_stall_flush(brw); BEGIN_BATCH(7);