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

glsl: check for arrays of arrays when assigning explicit locations

Browse Source 
This fixes assigning explicit locations in the CTS test:

ES31-CTS.explicit_uniform_location.uniform-loc-arrays-of-arrays

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Timothy Arceri
2015-10-21 13:44:10 +11:00
parent 9a04057ef1
commit 38ceeeadaa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/glsl/link_uniforms.cpp
View File

@@ -763,7 +763,8 @@ private:
/* Assign explicit locations. */ /* Assign explicit locations. */
if (current_var->data.explicit_location) { if (current_var->data.explicit_location) {
/* Set sequential locations for struct fields. */ /* Set sequential locations for struct fields. */
if (current_var->type->without_array()->is_record()) { if (current_var->type->without_array()->is_record() ||
current_var->type->is_array_of_arrays()) {
const unsigned entries = MAX2(1, this->uniforms[id].array_elements); const unsigned entries = MAX2(1, this->uniforms[id].array_elements);
this->uniforms[id].remap_location = this->uniforms[id].remap_location =
this->explicit_location + field_counter; this->explicit_location + field_counter;