diff options
author | Marek Olšák <maraeo@gmail.com> | 2010-04-11 01:13:11 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2010-04-11 01:32:15 +0200 |
commit | 1c356ac95b6df0962dbd15311ff7e0ea172e1aea (patch) | |
tree | e4d1090f383e3b232555b86b3aeb7fda585bed08 /src/gallium/drivers/r300/r300_blit.c | |
parent | 26a54ed6fddd42d8dba3d0c18d9d23ea63c62807 (diff) |
r300g: cleanup handling of sampler views
The evolution of TX_FORMAT bits is as follows:
* When a texture is created, set bits independent of pipe_format.
* When a sampler view is created, add format-specific bits.
* When sampler states and views are getting merged, add min/max LOD.
Diffstat (limited to 'src/gallium/drivers/r300/r300_blit.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index b99879afdd..f26330ef1d 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -111,11 +111,12 @@ static void r300_hw_copy(struct pipe_context* pipe, util_blitter_save_framebuffer(r300->blitter, r300->fb_state.state); util_blitter_save_fragment_sampler_states( - r300->blitter, state->sampler_count, (void**)state->sampler_states); + r300->blitter, state->sampler_state_count, + (void**)state->sampler_states); util_blitter_save_fragment_sampler_views( - r300->blitter, state->texture_count, - state->fragment_sampler_views); + r300->blitter, state->sampler_view_count, + (struct pipe_sampler_view**)state->sampler_views); /* Do a copy */ util_blitter_copy(r300->blitter, |