summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTopi Pohjolainen <topi.pohjolainen@intel.com>2015-03-06 15:55:02 +0200
committerTopi Pohjolainen <topi.pohjolainen@intel.com>2016-04-21 08:36:14 +0300
commite04b3cdf33f6fdb363c652e935d8a0b427ef6b15 (patch)
treec8ff885b458eb2f0737e0e5903b4136e168f5b15 /src
parentf1ddfa8512df62422db00281ce216eff7ec5706c (diff)
i965/blorp/gen7: Prepare re-using for gen8
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/gen7_blorp.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
index eae1e30e150..4debeb305ad 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);