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

mesa: count uniform against storage when its bindless

Browse Source 
Gallium drivers use this code path so we need to account for
bindless after all.

Fixes: 	365d34540f ("mesa: correctly calculate the storage offset for i915")

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri
2017-08-15 20:42:29 +10:00
parent 1ab7fed707
commit fe74c8ffbf
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/program/ir_to_mesa.cpp
View File

@@ -499,7 +499,7 @@ ir_to_mesa_visitor::src_reg_for_float(float val)
} }
static int static int
type_size(const struct glsl_type *type) storage_type_size(const struct glsl_type *type, bool bindless)
{ {
unsigned int i; unsigned int i;
int size; int size;
@@ -541,16 +541,18 @@ type_size(const struct glsl_type *type)
return 1; return 1;
case GLSL_TYPE_ARRAY: case GLSL_TYPE_ARRAY:
assert(type->length > 0); assert(type->length > 0);
return type_size(type->fields.array) * type->length; return storage_type_size(type->fields.array, bindless) * type->length;
case GLSL_TYPE_STRUCT: case GLSL_TYPE_STRUCT:
size = 0; size = 0;
for (i = 0; i < type->length; i++) { for (i = 0; i < type->length; i++) {
size += type_size(type->fields.structure[i].type); size += storage_type_size(type->fields.structure[i].type, bindless);
} }
return size; return size;
case GLSL_TYPE_SAMPLER: case GLSL_TYPE_SAMPLER:
case GLSL_TYPE_IMAGE: case GLSL_TYPE_IMAGE:
return 0; if (!bindless)
return 0;
/* fall through */
case GLSL_TYPE_SUBROUTINE: case GLSL_TYPE_SUBROUTINE:
return 1; return 1;
case GLSL_TYPE_ATOMIC_UINT: case GLSL_TYPE_ATOMIC_UINT:
@@ -565,6 +567,12 @@ type_size(const struct glsl_type *type)
return 0; return 0;
} }
static int
type_size(const struct glsl_type *type)
{
return storage_type_size(type, false);
}
/** /**
* In the initial pass of codegen, we assign temporary numbers to * In the initial pass of codegen, we assign temporary numbers to
* intermediate results. (not SSA -- variable assignments will reuse * intermediate results. (not SSA -- variable assignments will reuse
@@ -2452,7 +2460,7 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name,
assert(_mesa_lookup_parameter_index(params, name) < 0); assert(_mesa_lookup_parameter_index(params, name) < 0);
unsigned size = type_size(type) * 4; unsigned size = storage_type_size(type, var->data.bindless) * 4;
int index = _mesa_add_parameter(params, PROGRAM_UNIFORM, name, size, int index = _mesa_add_parameter(params, PROGRAM_UNIFORM, name, size,
type->gl_type, NULL, NULL); type->gl_type, NULL, NULL);