From: Paul Berry <stereotype441@gmail.com>
Date: Sat, 27 Jul 2013 22:24:46 +0000 (-0700)
Subject: glsl: Improve error message for interstage interface block mismatch.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5fe6b90c87c055fdfe24eb8b2075e6725ad59ecd;p=mesa.git

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.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/link_interface_blocks.cpp b/src/glsl/link_interface_blocks.cpp
index ffb44530f5d..928a88ee262 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;
       }
    }