radeonsi/nir: Use correct location for uniform access bound

location is the API-level location, but driver_location is the actual
location the uniform gets passed to the driver. This apparently only
caused failures with builtins, where the location is 0 because it's
represented via the state tokens instead.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Connor Abbott 2019-05-29 17:09:45 +02:00
parent 6571032af1
commit fca1a35163

View file

@ -709,7 +709,7 @@ void si_nir_scan_shader(const struct nir_shader *nir,
enum glsl_base_type base_type =
glsl_get_base_type(glsl_without_array(type));
unsigned aoa_size = MAX2(1, glsl_get_aoa_size(type));
unsigned loc = variable->data.location;
unsigned loc = variable->data.driver_location / 4;
int slot_count = glsl_count_attribute_slots(type, false);
int max_slot = MAX2(info->const_file_max[0], (int) loc) + slot_count;