Module: Mesa Branch: 10.3 Commit: ecd2d078ace5384f3760d60770620a847995cc28 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecd2d078ace5384f3760d60770620a847995cc28
Author: Michel Dänzer <[email protected]> Date: Thu Oct 2 16:00:26 2014 +0900 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" <[email protected]> Reviewed-by: Marek Olšák <[email protected]> (cherry picked from commit ed03747e6a1a0655bfd0b5e4a52455fbd37f97c5) --- src/gallium/drivers/radeonsi/si_descriptors.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 0e95f48..81ea11e 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -411,6 +411,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); } } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
