From: Brian <brian@yutani.localnet.net>
Date: Fri, 9 Mar 2007 18:43:53 +0000 (-0700)
Subject: Merge branch 'origin' into glsl-compiler-1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2cf5fd48d1586f961910a14324a457854cb66221;p=mesa.git

Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/context.c
---

2cf5fd48d1586f961910a14324a457854cb66221
diff --cc src/mesa/shader/arbprogparse.c
index 7d34bfbc808,c6ea5c4f973..5027264f031
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@@ -3861,8 -4036,9 +3861,9 @@@ _mesa_parse_arb_fragment_program(GLcont
     program->Base.InputsRead      = ap.Base.InputsRead;
     program->Base.OutputsWritten  = ap.Base.OutputsWritten;
     for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
 -      program->TexturesUsed[i] = ap.TexturesUsed[i];
 +      program->Base.TexturesUsed[i] = ap.TexturesUsed[i];
     program->FogOption          = ap.FogOption;
+    program->UsesKill          = ap.UsesKill;
  
     if (program->Base.Instructions)
        _mesa_free(program->Base.Instructions);