diff options
| author | Marek Olšák <[email protected]> | 2016-12-02 03:39:04 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-12-07 18:46:54 +0100 |
| commit | f2b0c66c3c012023433874b6e28f8cc8c3f64139 (patch) | |
| tree | d3eb7786de449a26de5fc46b896601b39f78185e | |
| parent | 38d4859b9465146189c234cd372de9d3eee86a92 (diff) | |
radeonsi: properly declare context sampler states
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_blit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index f5f49c1380c..83870e507b9 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -78,7 +78,7 @@ static void si_blitter_begin(struct pipe_context *ctx, enum si_blitter_op op) if (op & SI_SAVE_TEXTURES) { util_blitter_save_fragment_sampler_states( sctx->blitter, 2, - sctx->samplers[PIPE_SHADER_FRAGMENT].views.sampler_states); + (void**)sctx->samplers[PIPE_SHADER_FRAGMENT].views.sampler_states); util_blitter_save_fragment_sampler_views(sctx->blitter, 2, sctx->samplers[PIPE_SHADER_FRAGMENT].views.views); diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index cf661022d28..8b6e0bbb3a7 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -456,7 +456,7 @@ static void si_set_sampler_view(struct si_context *sctx, if (views->sampler_states[slot]) memcpy(desc + 12, - views->sampler_states[slot], 4*4); + views->sampler_states[slot]->val, 4*4); } views->enabled_mask |= 1u << slot; @@ -474,7 +474,7 @@ static void si_set_sampler_view(struct si_context *sctx, /* Re-set the sampler state if we are transitioning from FMASK. */ if (views->sampler_states[slot]) memcpy(desc + 12, - views->sampler_states[slot], 4*4); + views->sampler_states[slot]->val, 4*4); views->enabled_mask &= ~(1u << slot); } diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 3a9f0cf1acf..eb7a69f0bcb 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -245,7 +245,7 @@ struct si_descriptors { struct si_sampler_views { struct pipe_sampler_view *views[SI_NUM_SAMPLERS]; - void *sampler_states[SI_NUM_SAMPLERS]; + struct si_sampler_state *sampler_states[SI_NUM_SAMPLERS]; /* The i-th bit is set if that element is enabled (non-NULL resource). */ unsigned enabled_mask; |