diff options
author | Samuel Iglesias Gonsálvez <[email protected]> | 2016-01-05 13:21:17 +0100 |
---|---|---|
committer | Samuel Iglesias Gonsálvez <[email protected]> | 2016-01-13 07:01:55 +0100 |
commit | 69c4c752642d58e294f28db650afc4a9e8b0b38a (patch) | |
tree | 52eee81d2a9435c1772be725391319605d50f934 | |
parent | e937fd779fc8435750eb5168d2320d06ac259805 (diff) |
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]>
-rw-r--r-- | src/glsl/linker.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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); } |