From: Samuel Iglesias Gonsálvez Date: Tue, 5 Jan 2016 12:21:17 +0000 (+0100) Subject: glsl: add image_format check in cross_validate_globals() X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69c4c752642d58e294f28db650afc4a9e8b0b38a;p=mesa.git glsl: add image_format check in cross_validate_globals() Fixes CTS test: ES31-CTS.shader_image_load_store.negative-linkErrors Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93410 Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Tapani Pälli --- diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e8c0b981760..564c4712871 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1133,6 +1133,12 @@ cross_validate_globals(struct gl_shader_program *prog, mode_string(var), var->name); return; } + if (existing->data.image_format != var->data.image_format) { + linker_error(prog, "declarations for %s `%s` have " + "mismatching image format qualifiers\n", + mode_string(var), var->name); + return; + } } else variables.add_variable(var); }