diff options
| author | Brian <[email protected]> | 2008-02-26 19:31:22 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2008-02-26 19:31:22 -0700 |
| commit | 4da19dbcaa9f3e2d20fffd0145bf0bc756dd7542 (patch) | |
| tree | efd946fe548caad53bec8b64a6152c3d5f621149 /src/gallium/drivers/i915simple | |
| parent | a6044bdf74bae96f05310ad6e39942f172b8ab02 (diff) | |
gallium: remove pipe parameter from pipe_texture_reference()
Added pipe field to pipe_texture (temporary, see comments).
First step toward context-less texture creation...
Diffstat (limited to 'src/gallium/drivers/i915simple')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_texture.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c index 9df0e125406..27af46bea03 100644 --- a/src/gallium/drivers/i915simple/i915_state.c +++ b/src/gallium/drivers/i915simple/i915_state.c @@ -532,8 +532,7 @@ static void i915_set_sampler_texture(struct pipe_context *pipe, { struct i915_context *i915 = i915_context(pipe); - pipe_texture_reference(pipe, - (struct pipe_texture **) &i915->texture[sampler], + pipe_texture_reference((struct pipe_texture **) &i915->texture[sampler], texture); i915->dirty |= I915_NEW_TEXTURE; diff --git a/src/gallium/drivers/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c index 1b415a94d40..7fcf4332e14 100644 --- a/src/gallium/drivers/i915simple/i915_texture.c +++ b/src/gallium/drivers/i915simple/i915_texture.c @@ -489,6 +489,7 @@ i915_texture_create(struct pipe_context *pipe, tex->base = *templat; tex->base.refcount = 1; + tex->base.pipe = pipe; if (i915->flags.is_i945 ? i945_miptree_layout(pipe, tex) : i915_miptree_layout(pipe, tex)) |