vertex/fragment program field changes

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 2f78fd60b21037b16b9c80420c45284e4ae550f8..b2e9ba31874ab2e7ae2234b02cc4aad26135ce6c 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -166,8 +166,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
                                                I915_MAX_TEX_INSN);
    ctx->Const.FragmentProgram.MaxNativeTexIndirections = I915_MAX_TEX_INDIRECT;
    ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* I don't think we have one */
-   ctx->_MaintainTexEnvProgram = 1;
-   ctx->_UseTexEnvProgram = 1;
+   ctx->_MaintainTexEnvProgram = GL_TRUE;
 
 
    driInitExtensions( ctx, i915_extensions, GL_FALSE );

diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 2936a0fb721ac7eefa403e40353dd7e9c5b93d28..7924754c82ce295b9ab1e9a0cd7dd8a4772d60e1 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -46,7 +46,7 @@ static void i915_render_start( intelContextPtr intel )
    GLcontext *ctx = &intel->ctx;
    i915ContextPtr i915 = I915_CONTEXT(intel);
 
-   if (ctx->FragmentProgram._Active) 
+   if (ctx->FragmentProgram._Current) 
       i915ValidateFragmentProgram( i915 );
    else {
       assert(!ctx->_MaintainTexEnvProgram);