diff options
| author | Abdiel Janulgue <abdiel.janulgue@linux.intel.com> | 2014-12-30 06:28:17 +0200 |
|---|---|---|
| committer | Abdiel Janulgue <abdiel.janulgue@linux.intel.com> | 2015-09-10 12:22:28 +0300 |
| commit | 1b78f7099dd7b7dc83f697eed7cfd199166f8501 (patch) | |
| tree | a762b9091ef623e27be8d5d5e0d55e77b6ac5747 | |
| parent | a80e715db3f87a7178f67db70553c1a65edb1327 (diff) | |
i965: Enable push constants for UBOsgather_uniform_rework
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.c | 2 | ||||
| -rw-r--r-- | 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 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 ae18f0f162..2db625936b 100644 --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c @@ -179,7 +179,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: |