summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915/i915_vtbl.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2006-10-10 08:58:43 +0000
committerKeith Whitwell <[email protected]>2006-10-10 08:58:43 +0000
commitd886423b3c0b800656ba5d4c6480bba90f8e5981 (patch)
treea562460131fcd0577b7fa7ef03a74fefe2839992 /src/mesa/drivers/dri/i915/i915_vtbl.c
parentfcd758868b494411247ef94e0ea7cbac3e3ed79f (diff)
Use the mesa-provided texenv program rather than rolling our own.
Turn on texture crossbar support.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_vtbl.c')
-rw-r--r--src/mesa/drivers/dri/i915/i915_vtbl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 9ec54de23c5..2936a0fb721 100644
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -48,8 +48,10 @@ static void i915_render_start( intelContextPtr intel )
if (ctx->FragmentProgram._Active)
i915ValidateFragmentProgram( i915 );
- else
+ else {
+ assert(!ctx->_MaintainTexEnvProgram);
i915ValidateTextureProgram( i915 );
+ }
}