From 974f2e6c6a61f24e1ca23d2aaa02775123f2d43e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 4 Mar 2021 13:53:41 +1000 Subject: [PATCH] gallivm: mark subpass input attachments as 2d arrays This matters when multiview is enabled. Reviewed-by: Roland Scheidegger Acked-By: Mike Blumenkrantz Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_nir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index ba3ddf4..7a208c3 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -113,14 +113,16 @@ static unsigned glsl_sampler_to_pipe(int sampler_dim, bool is_array) pipe_target = is_array ? PIPE_TEXTURE_1D_ARRAY : PIPE_TEXTURE_1D; break; case GLSL_SAMPLER_DIM_2D: - case GLSL_SAMPLER_DIM_SUBPASS: pipe_target = is_array ? PIPE_TEXTURE_2D_ARRAY : PIPE_TEXTURE_2D; break; + case GLSL_SAMPLER_DIM_SUBPASS: + case GLSL_SAMPLER_DIM_SUBPASS_MS: + pipe_target = PIPE_TEXTURE_2D_ARRAY; + break; case GLSL_SAMPLER_DIM_3D: pipe_target = PIPE_TEXTURE_3D; break; case GLSL_SAMPLER_DIM_MS: - case GLSL_SAMPLER_DIM_SUBPASS_MS: pipe_target = is_array ? PIPE_TEXTURE_2D_ARRAY : PIPE_TEXTURE_2D; break; case GLSL_SAMPLER_DIM_CUBE: -- 2.7.4