summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i915/i915_texprog.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2005-01-06 14:35:44 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2005-01-06 14:35:44 +0000
commita2db56b34b7fe0fb58441d293ba56b8ed48141a8 (patch)
treeae1ede85df888975714ed214757e4c7cee9206b4 /src/mesa/drivers/dri/i915/i915_texprog.c
parent9f149bf2068c8897497d2b795006ae7334cfc3f6 (diff)
Add Intel i915GM support, and these extensions.
* GL_ARB_texture_cube_map * GL_EXT_blend_equation_separate * GL_ATI_blend_equation_separate * GL_ARB_point_parameters * GL_NV_blend_square * GL_EXT_cull_vertex * GL_ARB_depth_texture * GL_SGIX_depth_texture * GL_ARB_shadow * GL_EXT_shadow_funcs * GL_3DFX_texture_compression_FXT1 (Keith Whitwell, Tungsten Graphics)
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_texprog.c')
-rw-r--r--src/mesa/drivers/dri/i915/i915_texprog.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texprog.c b/src/mesa/drivers/dri/i915/i915_texprog.c
index ecf3a38a20..3eaf53d7d5 100644
--- a/src/mesa/drivers/dri/i915/i915_texprog.c
+++ b/src/mesa/drivers/dri/i915/i915_texprog.c
@@ -74,6 +74,19 @@ static GLuint get_source( struct i915_fragment_program *p,
}
return p->src_texture;
+
+ /* Crossbar: */
+ case GL_TEXTURE0:
+ case GL_TEXTURE1:
+ case GL_TEXTURE2:
+ case GL_TEXTURE3:
+ case GL_TEXTURE4:
+ case GL_TEXTURE5:
+ case GL_TEXTURE6:
+ case GL_TEXTURE7: {
+ return UREG_BAD;
+ }
+
case GL_CONSTANT:
return i915_emit_const4fv( p, p->ctx->Texture.Unit[unit].EnvColor );
case GL_PRIMARY_COLOR: