diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-02-20 11:20:25 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-02-20 11:20:25 -0700 |
| commit | 58edb0683db45c449b219988a8715cf8fd69e42d (patch) | |
| tree | 1797c58be2dfa6768673e8542a754797d37065e4 /src/mesa/state_tracker/st_gen_mipmap.c | |
| parent | 22a0b85eaebf767f5b03bf899596e09f5cc03876 (diff) | |
gallium: state tracker didn't always notify drivers of texobj data changes
Calling glTexSubImage() or glTexImage() to replace texture data didn't
reliably cause pipe->set_sampler_texture() to get called so drivers didn't
always get notified of new texture data.
The st_texture_object->pt pointer doesn't always indicate changed data so
added a dirtyData field.
Diffstat (limited to 'src/mesa/state_tracker/st_gen_mipmap.c')
| -rw-r--r-- | src/mesa/state_tracker/st_gen_mipmap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index 6c09b86033..a0b4b973aa 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -43,6 +43,7 @@ #include "st_draw.h" #include "st_gen_mipmap.h" #include "st_program.h" +#include "st_texture.h" #include "st_cb_drawpixels.h" #include "st_cb_texture.h" @@ -302,7 +303,8 @@ st_render_mipmap(struct st_context *st, pipe->bind_vs_state(pipe, st->state.vs->cso->data); if (st->state.sampler[0]) pipe->bind_sampler_state(pipe, 0, st->state.sampler[0]->data); - pipe->set_sampler_texture(pipe, 0, st->state.sampler_texture[0]); + pipe->set_sampler_texture(pipe, 0, + st_get_stobj_texture(st->state.sampler_texture[0])); pipe->set_viewport_state(pipe, &st->state.viewport); return TRUE; |