diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
| commit | 9b51c6da8bffdd67353b1e1245698a7eac478481 (patch) | |
| tree | cde44c263cb1756fae5b4a83facb3c0cdfa474e4 /mesalib/src/glsl/linker.cpp | |
| parent | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (diff) | |
| parent | ec617f09d07e32d6f57c0da133f53ad3d43a568a (diff) | |
| download | vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.gz vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.bz2 vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 8278e43ad..09ffdff63 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -1319,9 +1319,11 @@ assign_attribute_or_color_locations(gl_shader_program *prog, * attribute overlaps any previously allocated bits. */ if ((~(use_mask << attr) & used_locations) != used_locations) { + const char *const string = (target_index == MESA_SHADER_VERTEX) + ? "vertex shader input" : "fragment shader output"; linker_error(prog, - "insufficient contiguous attribute locations " - "available for vertex shader input `%s'", + "insufficient contiguous locations " + "available for %s `%s'", string, var->name); return false; } @@ -1370,7 +1372,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog, ? "vertex shader input" : "fragment shader output"; linker_error(prog, - "insufficient contiguous attribute locations " + "insufficient contiguous locations " "available for %s `%s'", string, to_assign[i].var->name); return false; |