OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: use the same driver location for packed varyings

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2016-05-18 10:26:05 +10:00
parent 0eea6b3297
commit 448adfbc67
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/nir/nir_lower_io.c
View File

@@ -43,10 +43,18 @@ struct lower_io_state {
void
nir_assign_var_locations(struct exec_list *var_list, unsigned *size,
unsigned base_offset,
int (*type_size)(const struct glsl_type *))
{
unsigned location = 0;
/* There are 32 regular and 32 patch varyings allowed */
int locations[64][2];
for (unsigned i = 0; i < 64; i++) {
for (unsigned j = 0; j < 2; j++)
locations[i][j] = -1;
}
nir_foreach_variable(var, var_list) {
/*
* UBO's have their own address spaces, so don't count them towards the
@@ -56,8 +64,24 @@ nir_assign_var_locations(struct exec_list *var_list, unsigned *size,
var->interface_type != NULL)
continue;
var->data.driver_location = location;
location += type_size(var->type);
/* Make sure we give the same location to varyings packed with
* ARB_enhanced_layouts.
*/
int idx = var->data.location - base_offset;
if (base_offset && idx >= 0) {
assert(idx < ARRAY_SIZE(locations));
if (locations[idx][var->data.index] == -1) {
var->data.driver_location = location;
locations[idx][var->data.index] = location;
location += type_size(var->type);
} else {
var->data.driver_location = locations[idx][var->data.index];
}
} else {
var->data.driver_location = location;
location += type_size(var->type);
}
}
*size = location;