diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
| commit | ca14143b18b939ee4506936e77478f8c593802b5 (patch) | |
| tree | 83cf183c0a8814b67d664d002611da95bc78a98f /mesalib/src/glsl/linker.cpp | |
| parent | 0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (diff) | |
| parent | 2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (diff) | |
| download | vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.gz vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.bz2 vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 0ef051965..23349f617 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -422,6 +422,12 @@ cross_validate_globals(struct gl_shader_program *prog, mode_string(var), var->name);
return false;
}
+ if (existing->centroid != var->centroid) {
+ linker_error_printf(prog, "declarations for %s `%s' have "
+ "mismatching centroid qualifiers\n",
+ mode_string(var), var->name);
+ return false;
+ }
} else
variables.add_variable(var);
}
|