summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/arbprogparse.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-10-10 15:26:28 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2008-10-10 15:26:28 +0100
commit3a3801c1431203fc4dca24d56577995ae2e78956 (patch)
tree7ec341b78ecc62dc1a238392aff828c363148d69 /src/mesa/shader/arbprogparse.c
parentd7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (diff)
parent7216679c1998b49ff5b08e6b43f8d5779415bf54 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
-rw-r--r--src/mesa/shader/arbprogparse.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 448251b223d..536404bf978 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3895,6 +3895,9 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
program->FogOption = ap.FogOption;
program->UsesKill = ap.UsesKill;
+ if (program->FogOption)
+ program->Base.InputsRead |= FRAG_BIT_FOGC;
+
if (program->Base.Instructions)
_mesa_free(program->Base.Instructions);
program->Base.Instructions = ap.Base.Instructions;