mesa: Branch 'master'

[Keith Whitwell]

 src/mesa/shader/arbprogparse.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree 7ecdfb2f08c8722ecad9269ef753420a49be3dde (from 95577064040ceeaaf7b0a460f91eac951cf8af18)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Sun Mar 4 21:47:05 2007 +0000

    Propogate UsesKill information.

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index b9ff08d..c6ea5c4 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -4038,6 +4038,7 @@ _mesa_parse_arb_fragment_program(GLconte
    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);