diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-12-07 10:21:56 -0700 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-09 12:05:26 +1100 |
| commit | 0d74d51790d81f6a19145ddb2f95d83c607c89dd (patch) | |
| tree | 8b88c31d43491843f04b5f8d6f849507dcdb886a /src/mesa/pipe/softpipe/sp_state_sampler.c | |
| parent | 99823680a51ccc46a76d0abe6a24e7e4465a4cc6 (diff) | |
Move struct softpipe_texture definition into sp_texture.h
Also, added softpipe_texture() cast wrapper.
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_sampler.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_sampler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c index e71b9159e3..173901f04e 100644 --- a/src/mesa/pipe/softpipe/sp_state_sampler.c +++ b/src/mesa/pipe/softpipe/sp_state_sampler.c @@ -32,6 +32,7 @@ #include "pipe/p_util.h" #include "sp_context.h" #include "sp_state.h" +#include "sp_texture.h" #include "sp_tile_cache.h" @@ -73,7 +74,7 @@ softpipe_set_texture_state(struct pipe_context *pipe, struct softpipe_context *softpipe = softpipe_context(pipe); assert(unit < PIPE_MAX_SAMPLERS); - softpipe->texture[unit] = (struct softpipe_texture *)texture; /* ptr, not struct */ + softpipe->texture[unit] = softpipe_texture(texture); /* ptr, not struct */ sp_tile_cache_set_texture(softpipe->tex_cache[unit], texture); |