AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: include variable name in error messages about initializers

Browse Source 
Also fix style / wrong indentation along the way and make the messages
more uniform.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Iago Toral Quiroga
2015-10-07 09:28:43 +02:00
parent f09c229cc6
commit 7a1143f29e
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/ast_to_hir.cpp
+17 -12
View File
@@ -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