diff options
| author | Timothy Arceri <[email protected]> | 2016-10-25 10:23:25 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 2e423ca1477bd212c01676c5e4828ebdb83310d8 (patch) | |
| tree | 5ada9a6686103e678b2bd29ed80768370fdc6ea4 /src/mesa/drivers | |
| parent | 4ac668616573b73a742a971bb0d7abe8234b6aa9 (diff) | |
nir: stop adjusting driver location for varying packing
As of 59864e8e020 we just use the location assigned by the front-end and
no longer need this for i965.
Since there were some issues in the logic with assigning arrays the same
driver location if they didn't start at the same location just remove it
and let other drivers implement a solution if needed when they add
ARB_enhanced_layouts support.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index ec48da9f2f8..a93d8252535 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -380,7 +380,7 @@ brw_nir_lower_fs_outputs(nir_shader *nir) void brw_nir_lower_cs_shared(nir_shader *nir) { - nir_assign_var_locations(&nir->shared, &nir->num_shared, 0, + nir_assign_var_locations(&nir->shared, &nir->num_shared, type_size_scalar_bytes); nir_lower_io(nir, nir_var_shared, type_size_scalar_bytes, 0); } diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index e0a1287f403..8f015026421 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -51,11 +51,11 @@ static void brw_nir_lower_uniforms(nir_shader *nir, bool is_scalar) { if (is_scalar) { - nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, 0, + nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, type_size_scalar_bytes); nir_lower_io(nir, nir_var_uniform, type_size_scalar_bytes, 0); } else { - nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, 0, + nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, type_size_vec4_bytes); nir_lower_io(nir, nir_var_uniform, type_size_vec4_bytes, 0); } |