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

linker: Accurately mark a uniform block instance array element as used in a stage

Browse Source 
Now that information about which array-of-arrays elements are accessed
is tracked, use that information to only mark an instance array element
as used-by-stage if, in fact, it is.

Fixes GL45-CTS.program_interface_query.uniform-block-types.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2016-12-13 20:33:08 -08:00
parent d32956935e
commit ceea514d91
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/link_uniforms.cpp
View File

@@ -905,7 +905,9 @@ link_update_uniform_buffer_variables(struct gl_linked_shader *shader,
shader->UniformBlocks : shader->ShaderStorageBlocks;
if (var->is_interface_instance()) {
if (variable_is_referenced(v, var)) {
const ir_array_refcount_entry *const entry = v.get_variable_entry(var);
if (entry->is_referenced) {
/* Since this is an interface instance, the instance type will be
* same as the array-stripped variable type. If the variable type
* is an array, then the block names will be suffixed with [0]
@@ -931,7 +933,9 @@ link_update_uniform_buffer_variables(struct gl_linked_shader *shader,
* be an array of instances, and all elements of the array need
* to be marked as referenced.
*/
if (strncmp(begin, var->get_interface_type()->name, len) == 0) {
if (strncmp(begin, var->get_interface_type()->name, len) == 0 &&
(!var->type->is_array() ||
entry->is_linearized_index_referenced(blks[i]->linearized_array_index))) {
blks[i]->stageref |= 1U << stage;
}
}