KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: check if implicitly sized arrays match explicitly sized arrays across the same stage 

V2: Improve error message.

Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
Timothy Arceri 2014-11-25 23:04:23 +11:00
parent 414be86c96
commit da4fb3e7a1
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/glsl/linker.cpp
View File

@ -731,8 +731,27 @@ cross_validate_globals(struct gl_shader_program *prog,
&& ((var->type->length == 0)
|| (existing->type->length == 0))) {
if (var->type->length != 0) {
if (var->type->length <= existing->data.max_array_access) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
mode_string(var),
var->name, var->type->name,
existing->data.max_array_access);
return;
}
existing->type = var->type;
}
} else if (existing->type->length != 0
&& existing->type->length <=
var->data.max_array_access) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
mode_string(var),
var->name, existing->type->name,
var->data.max_array_access);
return;
}
} else if (var->type->is_record()
&& existing->type->is_record()
&& existing->type->record_compare(var->type)) {