From: Karl Rasche <karlrasche@gmail.com>
Date: Fri, 21 Nov 2003 01:22:46 +0000 (+0000)
Subject: Caught missing parse_color_type() [Jacob Jansen]
X-Git-Tag: 062012170305~25397
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6a4257f76abbdd1ced815f3262525ee8b067ab0;p=profile%2Fivi%2Fmesa.git

Caught missing parse_color_type() [Jacob Jansen]
---

diff --git a/src/mesa/main/arbparse.c b/src/mesa/main/arbparse.c
index 33b31db..87de224 100644
--- a/src/mesa/main/arbparse.c
+++ b/src/mesa/main/arbparse.c
@@ -3615,11 +3615,12 @@ parse_result_binding (GLcontext * ctx, byte ** inst, GLuint * binding,
          /* for vtx programs, this is VERTEX_RESULT_COLOR */
          else {
             GLint color_type;
+            GLuint face_type = parse_face_type(inst);
+	    GLint color_type_ret = parse_color_type(ctx, inst, Program, &color_type);
 
             /* back face */
-            if (parse_face_type (inst)) {
-               if (parse_color_type (ctx, inst, Program, &color_type))
-                  return 1;
+            if (face_type) {
+               if (color_type_ret) return 1; 
 
                /* secondary color */
                if (color_type) {