[Mesa-dev] [PATCH] mesa: Fix bogus transform feedback error message when subscripting non-array.

[Kenneth Graunke]

On 01/04/2012 03:23 PM, Paul Berry wrote:
> 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."
> ---
>  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 5958516..20d9f3e 100644
> --- a/src/glsl/linker.cpp
> +++ b/src/glsl/linker.cpp
> @@ -1591,9 +1591,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;

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>