Caught missing parse_color_type() [Jacob Jansen]
authorKarl Rasche <karlrasche@gmail.com>
Fri, 21 Nov 2003 01:22:46 +0000 (01:22 +0000)
committerKarl Rasche <karlrasche@gmail.com>
Fri, 21 Nov 2003 01:22:46 +0000 (01:22 +0000)
src/mesa/main/arbparse.c

index 33b31db590f48e7533089217da65a83b65f1ed7c..87de22468a27db8c2aef503c09132f70731024eb 100644 (file)
@@ -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) {