diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-03-06 11:50:33 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-03-06 11:50:33 -0800 |
| commit | fa8961069c5a99f118deeb5c0217e7c7e1de5f1a (patch) | |
| tree | 89bfa3efc22b429f0197b081963d55ef1bdc4614 /src/mesa/shader | |
| parent | 091be1119050f8cd158161aa3960b1f4260cd790 (diff) | |
| parent | a510bc3ee1a696da120c09ee4ec33dc033f671ac (diff) | |
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c index b9ff08de5f..c6ea5c4f97 100644 --- a/src/mesa/shader/arbprogparse.c +++ b/src/mesa/shader/arbprogparse.c @@ -4038,6 +4038,7 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target, for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++) program->TexturesUsed[i] = ap.TexturesUsed[i]; program->FogOption = ap.FogOption; + program->UsesKill = ap.UsesKill; if (program->Base.Instructions) _mesa_free(program->Base.Instructions); |