aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe/i915simple/i915_state.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2007-08-08 11:10:37 +0100
committerKeith Whitwell <[email protected]>2007-08-08 11:14:08 +0100
commitdbb297fac6a9637cc7ee7ab2cf40f196048ba626 (patch)
tree51182cf8ee3d28c5ed36ac745d99082d1891c8cb /src/mesa/pipe/i915simple/i915_state.c
parent7e78b9e4d0117d7438fa1a07dff2bc261a9100d9 (diff)
Hook up i915simple. Doesn't compile.
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_state.c')
-rw-r--r--src/mesa/pipe/i915simple/i915_state.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/pipe/i915simple/i915_state.c b/src/mesa/pipe/i915simple/i915_state.c
index d732e879db0..ebc55eb6346 100644
--- a/src/mesa/pipe/i915simple/i915_state.c
+++ b/src/mesa/pipe/i915simple/i915_state.c
@@ -135,12 +135,11 @@ static void i915_set_sampler_state(struct pipe_context *pipe,
static void i915_set_texture_state(struct pipe_context *pipe,
- GLuint unit,
- struct pipe_texture_object *texture)
+ GLuint unit,
+ struct pipe_mipmap_tree *texture)
{
struct i915_context *i915 = i915_context(pipe);
- assert(unit < PIPE_MAX_SAMPLERS);
i915->texture[unit] = texture; /* ptr, not struct */
i915->dirty |= I915_NEW_TEXTURE;