Switches on push constants whenever we have UBO entries.
Signed-off-by: Abdiel Janulgue <abdiel.janul...@linux.intel.com>
---
src/mesa/drivers/dri/i965/gen7_wm_state.c | 2 +-
src/mesa/drivers/dri/i965/gen8_ps_state.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c
b/src/mesa/drivers/dri/i965/gen7_wm_state.c
index fd6dab5..e8c5347 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c
@@ -173,7 +173,7 @@ gen7_upload_ps_state(struct brw_context *brw,
dw4 |= (brw->max_wm_threads - 1) << max_threads_shift;
- if (prog_data->base.nr_params > 0)
+ if (prog_data->base.nr_params > 0 || prog_data->base.nr_ubo_params > 0)
dw4 |= GEN7_PS_PUSH_CONSTANT_ENABLE;
/* From the IVB PRM, volume 2 part 1, page 287:
diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c
b/src/mesa/drivers/dri/i965/gen8_ps_state.c
index a686fed..487e414 100644
--- a/src/mesa/drivers/dri/i965/gen8_ps_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c
@@ -183,7 +183,7 @@ gen8_upload_ps_state(struct brw_context *brw,
else
dw6 |= (64 - 2) << HSW_PS_MAX_THREADS_SHIFT;
- if (prog_data->base.nr_params > 0)
+ if (prog_data->base.nr_params > 0 || prog_data->base.nr_ubo_params > 0)
dw6 |= GEN7_PS_PUSH_CONSTANT_ENABLE;
/* From the documentation for this packet:
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
