Module: Mesa Branch: master Commit: 82f64a68a4a621252111ff62fce4e85e14cdc822 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82f64a68a4a621252111ff62fce4e85e14cdc822
Author: Marek Olšák <[email protected]> Date: Sun Feb 1 13:16:06 2015 +0100 radeonsi: fix a crash when binding a NULL sampler view list Reviewed-by: Michel Dänzer <[email protected]> --- src/gallium/drivers/radeonsi/si_descriptors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 15b4da1..372782f 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -404,7 +404,7 @@ static void si_set_sampler_views(struct pipe_context *ctx, for (i = 0; i < count; i++) { unsigned slot = start + i; - if (!views[i]) { + if (!views || !views[i]) { samplers->depth_texture_mask &= ~(1 << slot); samplers->compressed_colortex_mask &= ~(1 << slot); si_set_sampler_view(sctx, shader, slot, NULL, NULL); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
