OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: properly declare context sampler states

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2016-12-02 03:39:04 +01:00
parent 38d4859b94
commit f2b0c66c3c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_blit.c
View File

@@ -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);

4
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@@ -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);
}

2
src/gallium/drivers/radeonsi/si_state.h
View File

@@ -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;