summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@linux.intel.com>2014-12-30 06:28:17 +0200
committerAbdiel Janulgue <abdiel.janulgue@linux.intel.com>2015-09-11 10:53:26 +0300
commit98ec1b78a914e5d83e302626a9ee8af07b448c62 (patch)
tree84ec94dcaf8a7524b157cfa1ab52b15236884268
parentbb1380a95835fbffe99a7f966484a777f8e3dde0 (diff)
i965: Enable push constants for UBOsGATHER
Switches on push constants whenever we have UBO entries. Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
-rw-r--r--src/mesa/drivers/dri/i965/gen7_wm_state.c2
-rw-r--r--src/mesa/drivers/dri/i965/gen8_ps_state.c2
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 fd6dab5be8..e8c53476e7 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 a686fed704..487e4146db 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: