Module: Mesa
Branch: master
Commit: 5fe6b90c87c055fdfe24eb8b2075e6725ad59ecd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fe6b90c87c055fdfe24eb8b2075e6725ad59ecd
Author: Paul Berry <stereotype...@gmail.com>
Date: Sat Jul 27 15:24:46 2013 -0700
glsl: Improve error message for interstage interface block mismatch.
We're now emitting this error from a point where we have easy access
to the name of the block that failed to match, so go ahead and include
that in the error message, as we do for intrastage interface block
mismatches.
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/glsl/link_interface_blocks.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/glsl/link_interface_blocks.cpp
b/src/glsl/link_interface_blocks.cpp
index ffb4453..928a88e 100644
--- a/src/glsl/link_interface_blocks.cpp
+++ b/src/glsl/link_interface_blocks.cpp
@@ -105,7 +105,8 @@ validate_interstage_interface_blocks(struct
gl_shader_program *prog,
continue;
if (var->interface_type != expected_type) {
- linker_error(prog, "interface block mismatch between shader
stages\n");
+ linker_error(prog, "definitions of interface block `%s' do not "
+ "match\n", var->interface_type->name);
return;
}
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
