diff options
| author | Karl Rasche <[email protected]> | 2003-11-21 01:22:46 +0000 |
|---|---|---|
| committer | Karl Rasche <[email protected]> | 2003-11-21 01:22:46 +0000 |
| commit | a6a4257f76abbdd1ced815f3262525ee8b067ab0 (patch) | |
| tree | dd15142a232554cf9f751181fb9cf6574007d391 /src/mesa/main | |
| parent | 08e6fb367efc28b449a11df3057f966cada10f4c (diff) | |
Caught missing parse_color_type() [Jacob Jansen]
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/arbparse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/main/arbparse.c b/src/mesa/main/arbparse.c index 33b31db590f..87de22468a2 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) { |