mesa: Branch 'master'

[Roland Scheidegger]

 src/mesa/drivers/dri/i915tex/i915_context.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 811c2e9a91dfc94ec582849bfaa86d7932ac848c (from cda32360925d84072a69c6fc0bfebbfe07d90ebc)
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Mar 27 22:57:22 2007 +0200

    i915tex compile fix (account for moved _UseTexEnvProgram var)

diff --git a/src/mesa/drivers/dri/i915tex/i915_context.c b/src/mesa/drivers/dri/i915tex/i915_context.c
index 4887d80..49e3014 100644
--- a/src/mesa/drivers/dri/i915tex/i915_context.c
+++ b/src/mesa/drivers/dri/i915tex/i915_context.c
@@ -158,7 +158,7 @@ i915CreateContext(const __GLcontextModes
    ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* I don't think we have one */
 
    ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
-   ctx->_UseTexEnvProgram = GL_TRUE;
+   ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE;
 
    driInitExtensions(ctx, i915_extensions, GL_FALSE);