From 659ec1c958b59b77b5334d1121722ea0c80dddf8 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Sat, 27 Jul 2013 14:58:43 -0700 Subject: glsl: Add error message for intrastage interface block mismatch. Previously we failed to link (which is correct), but we did not output an error message, which could have been confusing for users. Reviewed-by: Jordan Justen Reviewed-by: Ian Romanick --- src/glsl/link_interface_blocks.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/glsl/link_interface_blocks.cpp') diff --git a/src/glsl/link_interface_blocks.cpp b/src/glsl/link_interface_blocks.cpp index b91860d0394..4f67291d85f 100644 --- a/src/glsl/link_interface_blocks.cpp +++ b/src/glsl/link_interface_blocks.cpp @@ -32,7 +32,8 @@ #include "main/macros.h" bool -validate_intrastage_interface_blocks(const gl_shader **shader_list, +validate_intrastage_interface_blocks(struct gl_shader_program *prog, + const gl_shader **shader_list, unsigned num_shaders) { glsl_symbol_table interfaces; @@ -62,6 +63,8 @@ validate_intrastage_interface_blocks(const gl_shader **shader_list, interfaces.add_interface(iface_type->name, iface_type, (enum ir_variable_mode) var->mode); } else if (old_iface_type != iface_type) { + linker_error(prog, "definitions of interface block `%s' do not" + " match\n", iface_type->name); return false; } } -- cgit v1.2.3