diff options
| author | Marek Olšák <[email protected]> | 2012-07-14 15:26:59 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-07-17 21:22:15 +0200 |
| commit | 5d8d4252f2f6632fc455dcf1079c95495ef445ac (patch) | |
| tree | 1676fc27e3b880838d84dc9fea288fbe65597ca6 /src/gallium/drivers/r600/r600_blit.c | |
| parent | 7022f49b52cb8b414a3716a08deb741cce9ed75c (diff) | |
r600g: convert sampler view emission into atoms
Vertex and constant buffers are emitted in the same way.
This is mainly a simplification of the code. The cleanup is in another patch.
Diffstat (limited to 'src/gallium/drivers/r600/r600_blit.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 7679012f842..9429a1bdcc8 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -74,8 +74,8 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op (void**)rctx->ps_samplers.samplers); util_blitter_save_fragment_sampler_views( - rctx->blitter, rctx->ps_samplers.n_views, - (struct pipe_sampler_view**)rctx->ps_samplers.views); + rctx->blitter, util_last_bit(rctx->ps_samplers.views.enabled_mask), + (struct pipe_sampler_view**)rctx->ps_samplers.views.views); } if ((op & R600_DISABLE_RENDER_COND) && rctx->current_render_cond) { @@ -184,7 +184,7 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, } void r600_flush_depth_textures(struct r600_context *rctx, - struct r600_textures_info *textures) + struct r600_samplerview_state *textures) { unsigned i; unsigned depth_texture_mask = textures->depth_texture_mask; |