diff options
author | Paul Berry <stereotype441@gmail.com> | 2012-01-04 15:17:52 -0800 |
---|---|---|
committer | Paul Berry <stereotype441@gmail.com> | 2012-01-09 10:30:35 -0800 |
commit | 108cba21dec82a7e10962cf01f2835e7b950ff74 (patch) | |
tree | 7a8b35dbe90a540a7f7ae18b85d7758af3f9496b /src | |
parent | b87b857d90008d045175a6673cabbf9e448d21bc (diff) |
mesa: Fix bogus transform feedback error message when subscripting non-array.
Previous to this patch, if the client requested transform feedback
using a subscript, but the variable was not an array
(e.g. "gl_FrontColor[0]"), we would produce a bogus error message like
"Transform feedback varying gl_FrontColor[0] found, but it's an array
([] expected)".
Changed the error message to e.g. "Transfrorm feedback varying
gl_FrontColor[0] requested, but gl_FrontColor is not an array."
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/glsl/linker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 88c81c41b06..e8472d44697 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1576,9 +1576,9 @@ tfeedback_decl::assign_location(struct gl_context *ctx, } else { /* Regular variable (scalar, vector, or matrix) */ if (this->is_subscripted) { - linker_error(prog, "Transform feedback varying %s found, " - "but it's an array ([] expected).", - this->orig_name); + linker_error(prog, "Transform feedback varying %s requested, " + "but %s is not an array.", + this->orig_name, this->var_name); return false; } this->location = output_var->location; |