diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-05 09:01:31 -0500 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-05 09:01:31 -0500 |
| commit | 540e1c70ccb756200dbec3441b8238fac8e1cebe (patch) | |
| tree | e00aa4fbf86bcff3cae5d39c6bf79a121b85fc8a /src/mesa | |
| parent | 180c0d70c43abe694e8b601159e02baf9af7b042 (diff) | |
| parent | 7ecdfb2f08c8722ecad9269ef753420a49be3dde (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa')
| -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); |