From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 7 Apr 2010 23:41:40 +0000 (-0700)
Subject: Use _mesa_glsl_shader_target_name
X-Git-Tag: 062012170305~10660^2~625^2~404
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae4c4c07959f059e557ea44e98552ced1fec9f47;p=profile%2Fivi%2Fmesa.git

Use _mesa_glsl_shader_target_name
---

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index 6afd7ea..07d40e2 100644
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -1306,11 +1306,12 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
    if (qual->centroid)
       var->centroid = 1;
 
-   if (qual->attribute && state->target == fragment_shader) {
+   if (qual->attribute && state->target != vertex_shader) {
       var->type = glsl_type::error_type;
       _mesa_glsl_error(loc, state,
 		       "`attribute' variables may not be declared in the "
-		       "fragment shader");
+		       "%s shader",
+		       _mesa_glsl_shader_target_name(state->target));
    }
 
    /* From page 25 (page 31 of the PDF) of the GLSL 1.10 spec:
@@ -1590,8 +1591,7 @@ ast_declarator_list::hir(exec_list *instructions,
 	 if ((var->mode == ir_var_in) && (state->current_function == NULL)) {
 	    _mesa_glsl_error(& initializer_loc, state,
 			     "cannot initialize %s shader input / %s",
-			     (state->target == vertex_shader)
-			     ? "vertex" : "fragment",
+			     _mesa_glsl_shader_target_name(state->target),
 			     (state->target == vertex_shader)
 			     ? "attribute" : "varying");
 	 }