diff options
| author | Tapani Pälli <[email protected]> | 2015-10-20 12:18:51 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2015-10-21 06:12:15 +0300 |
| commit | a59c1adcc665b70ca5a8fbfebe3f0d6e05ad2778 (patch) | |
| tree | 645acea715239121a679829bbb6114823ca06e5f | |
| parent | 1f48ea1193e3659c3f94b5de31d9200c1d500e72 (diff) | |
glsl: fix record type detection in explicit location assign
Check current_var directly instead of using the passed in record_type.
This fixes following failing CTS test:
ES31-CTS.explicit_uniform_location.uniform-loc-types-structs
No Piglit regressions.
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Marta Lofstedt <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index f7b87a1811a..6efde5c27f2 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -763,7 +763,7 @@ private: /* Assign explicit locations. */ if (current_var->data.explicit_location) { /* Set sequential locations for struct fields. */ - if (record_type != NULL) { + if (current_var->type->without_array()->is_record()) { const unsigned entries = MAX2(1, this->uniforms[id].array_elements); this->uniforms[id].remap_location = this->explicit_location + field_counter; |