Module: Mesa Branch: master Commit: 69c4c752642d58e294f28db650afc4a9e8b0b38a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=69c4c752642d58e294f28db650afc4a9e8b0b38a
Author: Samuel Iglesias Gonsálvez <[email protected]> Date: Tue Jan 5 13:21:17 2016 +0100 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 <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> --- src/glsl/linker.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e8c0b98..564c471 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); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
