fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 23:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Slightly restructure error generation in validate_explicit_location

Browse source 
Use mode_string to get the name of the variable mode.  Slightly change
the control flow.  Both of these changes make it easier to support
separate shader object location layouts.

The format of the message changed because mode_string can return a
string like "shader output".  This would result in an awkward message
like "vertex shader shader output..."

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Ian Romanick 2013-09-25 13:53:56 -07:00
parent f8c579dc0f
commit 9d6294f5a2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/glsl/ast_to_hir.cpp
View file

@ -2053,7 +2053,6 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
YYLTYPE *loc)
{
bool fail = false;
const char *string = "";
/* In the vertex shader only shader inputs can be given explicit
* locations.
@ -2063,10 +2062,11 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
*/
switch (state->target) {
case vertex_shader:
if (var->mode != ir_var_shader_in) {
fail = true;
string = "input";
if (var->mode == ir_var_shader_in) {
break;
}
fail = true;
break;
case geometry_shader:
@ -2076,19 +2076,19 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
return;
case fragment_shader:
if (var->mode != ir_var_shader_out) {
fail = true;
string = "output";
if (var->mode == ir_var_shader_out) {
break;
}
fail = true;
break;
};
if (fail) {
_mesa_glsl_error(loc, state,
"only %s shader %s variables can be given an "
"explicit location",
_mesa_glsl_shader_target_name(state->target),
string);
"%s cannot be given an explicit location in %s shader",
mode_string(var),
_mesa_glsl_shader_target_name(state->target));
} else {
var->explicit_location = true;