Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
On 07/10/15 10:12, Iago Toral Quiroga wrote:
> Also fix style / wrong indentation along the way and make the messages
> more uniform.
> ---
> src/glsl/ast_to_hir.cpp | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> index da79597..e5543ca 100644
> --- a/src/glsl/ast_to_hir.cpp
> +++ b/src/glsl/ast_to_hir.cpp
> @@ -3170,7 +3170,8 @@ process_initializer(ir_variable *var, ast_declaration
> *decl,
> */
> if (var->data.mode == ir_var_uniform) {
> state->check_version(120, 0, &initializer_loc,
> - "cannot initialize uniforms");
> + "cannot initialize uniform %s",
> + var->name);
> }
>
> /* Section 4.3.7 "Buffer Variables" of the GLSL 4.30 spec:
> @@ -3178,8 +3179,9 @@ process_initializer(ir_variable *var, ast_declaration
> *decl,
> * "Buffer variables cannot have initializers."
> */
> if (var->data.mode == ir_var_shader_storage) {
> - _mesa_glsl_error(& initializer_loc, state,
> - "SSBO variables cannot have initializers");
> + _mesa_glsl_error(&initializer_loc, state,
> + "cannot initialize buffer variable %s",
> + var->name);
> }
>
> /* From section 4.1.7 of the GLSL 4.40 spec:
> @@ -3189,22 +3191,25 @@ process_initializer(ir_variable *var, ast_declaration
> *decl,
> * shader."
> */
> if (var->type->contains_opaque()) {
> - _mesa_glsl_error(& initializer_loc, state,
> - "cannot initialize opaque variable");
> + _mesa_glsl_error(&initializer_loc, state,
> + "cannot initialize opaque variable %s",
> + var->name);
> }
>
> if ((var->data.mode == ir_var_shader_in) && (state->current_function ==
> NULL)) {
> - _mesa_glsl_error(& initializer_loc, state,
> - "cannot initialize %s shader input / %s",
> - _mesa_shader_stage_to_string(state->stage),
> - (state->stage == MESA_SHADER_VERTEX)
> - ? "attribute" : "varying");
> + _mesa_glsl_error(&initializer_loc, state,
> + "cannot initialize %s shader input / %s %s",
> + _mesa_shader_stage_to_string(state->stage),
> + (state->stage == MESA_SHADER_VERTEX)
> + ? "attribute" : "varying",
> + var->name);
> }
>
> if ((var->data.mode == ir_var_shader_out) && (state->current_function ==
> NULL)) {
> _mesa_glsl_error(&initializer_loc, state,
> - "cannot initialize %s shader output",
> - _mesa_shader_stage_to_string(state->stage));
> + "cannot initialize %s shader output %s",
> + _mesa_shader_stage_to_string(state->stage),
> + var->name);
> }
>
> /* If the initializer is an ast_aggregate_initializer, recursively store
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
