From 26103487b54a1c1121132cc040927619cce45262 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Wed, 28 Feb 2018 04:28:29 +0100 Subject: [PATCH] softpipe: don't iterate through PIPE_MAX_SHADER_SAMPLER_VIEWS We were setting view to NULL if the iteration was larger than i. But in fact if the view is NULL the code did nothing anyway... Reviewed-by: Brian Paul Reviewed-by: Jose Fonseca --- src/gallium/drivers/softpipe/sp_state_sampler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index c10fd918fd8..751eb76e84b 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -181,8 +181,8 @@ prepare_shader_sampling( if (!num) return; - for (i = 0; i < PIPE_MAX_SHADER_SAMPLER_VIEWS; i++) { - struct pipe_sampler_view *view = i < num ? views[i] : NULL; + for (i = 0; i < num; i++) { + struct pipe_sampler_view *view = views[i]; if (view) { struct pipe_resource *tex = view->texture; -- 2.11.0