[Mesa-dev] [PATCH 2/4] glsl: Drop duplicate error messages.

[Kenneth Graunke]

On Thursday, August 15, 2013 11:27:14 AM Matt Turner wrote:
> This same message is printed in the validate_matrix_layout_for_type
> function.
> ---
>  src/glsl/ast_to_hir.cpp | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> index 9bc713d..c9ffa30 100644
> --- a/src/glsl/ast_to_hir.cpp
> +++ b/src/glsl/ast_to_hir.cpp
> @@ -2275,13 +2275,7 @@ apply_type_qualifier_to_variable(const struct
> ast_type_qualifier *qual, }
> 
>     if (qual->flags.q.row_major || qual->flags.q.column_major) {
> -      if (!ubo_qualifiers_allowed) {
> -	 _mesa_glsl_error(loc, state,
> -			  "uniform block layout qualifiers row_major and "
> -			  "column_major can only be applied to uniform 
block "
> -			  "members");
> -      } else
> -	 validate_matrix_layout_for_type(state, loc, var->type);
> +      validate_matrix_layout_for_type(state, loc, var->type);

Maybe I'm blind, but I don't see where row_major/column_major are only allowed 
for uniform blocks, as opposed to other interface blocks or variables in 
general.  I thought that was part of what ubo_qualifiers_valid did, but 
clearly it doesn't.

Regardless, assuming you fix the typo in patch 4's error message...

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