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

linker: Slight code rearrange to prevent duplication in the next commit

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Ian Romanick
2016-11-07 15:54:46 -08:00
parent a529acfb2b
commit 392fabcfee
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -928,13 +928,12 @@ link_update_uniform_buffer_variables(struct gl_linked_shader *shader)
if ((ptrdiff_t) l != (end - begin)) if ((ptrdiff_t) l != (end - begin))
continue; continue;
if (strncmp(var->name, begin, l) == 0) { found = strncmp(var->name, begin, l) == 0;
found = true; } else {
var->data.location = j; found = strcmp(var->name, blks[i]->Uniforms[j].Name) == 0;
break; }
}
} else if (!strcmp(var->name, blks[i]->Uniforms[j].Name)) { if (found) {
found = true;
var->data.location = j; var->data.location = j;
break; break;
} }