From: Alyssa Rosenzweig Date: Tue, 7 Jan 2020 02:36:20 +0000 (-0500) Subject: panfrost: Don't double-flip Z/W for 2D arrays X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4cd3dc94ad7ba991c960457b9134ce233b5b41ab;p=mesa.git panfrost: Don't double-flip Z/W for 2D arrays We need to mindful that we don't clobber the shadow comparator. Fixes dEQP-GLES3.functional.shaders.texture_functions.texture.sampler2darrayshadow_* Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso --- diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 568a08da44c..efd9f483de5 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1837,10 +1837,13 @@ emit_texop_native(compiler_context *ctx, nir_tex_instr *instr, } if (instr->sampler_dim == GLSL_SAMPLER_DIM_2D) { - /* Array component in w but NIR wants it in z */ + /* Array component in w but NIR wants it in z, + * but if we have a temp coord we already fixed + * that up */ + if (nr_components == 3) { ins.swizzle[1][2] = COMPONENT_Z; - ins.swizzle[1][3] = COMPONENT_Z; + ins.swizzle[1][3] = needs_temp_coord ? COMPONENT_W : COMPONENT_Z; } else if (nr_components == 2) { ins.swizzle[1][2] = instr->is_shadow ? COMPONENT_Z : COMPONENT_X;