diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-06 09:03:18 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-06 09:03:18 -0700 |
| commit | 330d7e2080ec3f4385f83a6b68e4b46f28aee7a8 (patch) | |
| tree | 5a74458a65182a840c4dc80406d4308c66d2798d /src/mesa/shader | |
| parent | a8ba888a351ceb4242fa334f3c41ef76d7f25bc8 (diff) | |
| parent | 6f9b1afc862851532e4820705c412388b497ad58 (diff) | |
Merge branch 'master' of git+ssh://brianp@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); |