diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-13 14:21:23 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-13 14:21:23 +1100 |
| commit | b397a2bb203c2b28b746af7828d9ad192cde0bc1 (patch) | |
| tree | 77448bf1db79ae112f057717109aaa98e5696b15 /src/mesa/pipe/softpipe/sp_state_sampler.c | |
| parent | 5ba3dbe2cc8a9af5cae01f45eaf497f834400170 (diff) | |
| parent | e20e89e48287808068086ec148920dd89495d813 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_state_sampler.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_sampler.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c index 291bbc40ad..6a5a643c89 100644 --- a/src/mesa/pipe/softpipe/sp_state_sampler.c +++ b/src/mesa/pipe/softpipe/sp_state_sampler.c @@ -34,6 +34,8 @@ #include "sp_state.h" #include "sp_texture.h" #include "sp_tile_cache.h" +#include "pipe/draw/draw_context.h" + void * @@ -73,6 +75,8 @@ softpipe_set_sampler_texture(struct pipe_context *pipe, { struct softpipe_context *softpipe = softpipe_context(pipe); + draw_flush(softpipe->draw); + assert(unit < PIPE_MAX_SAMPLERS); softpipe->texture[unit] = softpipe_texture(texture); /* ptr, not struct */ |