diff options
| author | Brian <[email protected]> | 2006-12-15 10:10:23 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2006-12-15 10:10:23 -0700 |
| commit | 4b4632f94c726c19d3c1efd05ceb5770a430cefd (patch) | |
| tree | eda373878ae6a7ed4e6bffa3b6cb307b567bd909 | |
| parent | d6aff512feb102eacb41b36e9f9e750d94c299af (diff) | |
vertex/fragment program field changes
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_vtbl.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 2f78fd60b21..b2e9ba31874 100644 --- 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 2936a0fb721..7924754c82c 100644 --- 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); |