fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 02:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: let interface linking code validate its arrays

Browse source 
Currently intrastage arrays are validated twice for interface blocks.

Reviewed-by: Mark Janes <mark.a.janes@intel.com>
This commit is contained in:
Timothy Arceri 2015-02-24 17:28:51 +11:00
parent c5a56a63f9
commit 1a96d9ef1c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/glsl/linker.cpp
View file

@ -762,7 +762,8 @@ cross_validate_globals(struct gl_shader_program *prog,
/* Check if types match. Interface blocks have some special
* rules so we handle those elsewhere.
*/
if (var->type != existing->type) {
if (var->type != existing->type &&
!var->is_interface_instance()) {
if (!validate_intrastage_arrays(prog, var, existing)) {
if (var->type->is_record() && existing->type->is_record()
&& existing->type->record_compare(var->type)) {