diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-10-02 16:00:26 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2014-10-03 11:15:38 +0900 |
| commit | ed03747e6a1a0655bfd0b5e4a52455fbd37f97c5 (patch) | |
| tree | 45aeeb42c439306d5c1e375b284e3325c8d8384f /src | |
| parent | ca000702592b80761fb223f352bfd98d893877e7 (diff) | |
radeonsi: Clear sampler view flags when binding a buffer
Fixes assertion failure while running the Unreal Engine 4 Elemental demo:
.../si_blit.c:322:si_decompress_color_textures: Assertion `tex->cmask.size || tex->fmask.size' failed.
Cc: "10.2 10.3" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index fc535d01a84..922703445be 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -422,6 +422,11 @@ static void si_set_sampler_views(struct pipe_context *ctx, si_set_sampler_view(sctx, shader, SI_FMASK_TEX_OFFSET + slot, NULL, NULL); } + } else { + samplers->depth_texture_mask &= ~(1 << slot); + samplers->compressed_colortex_mask &= ~(1 << slot); + si_set_sampler_view(sctx, shader, SI_FMASK_TEX_OFFSET + slot, + NULL, NULL); } } |