diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-01-06 21:36:20 -0500 |
|---|---|---|
| committer | Tomeu Vizoso <[email protected]> | 2020-01-07 08:54:52 +0100 |
| commit | 4cd3dc94ad7ba991c960457b9134ce233b5b41ab (patch) | |
| tree | a7ae1337040ccbe92ef12be7e1836d55b1c117f5 /src/panfrost/midgard | |
| parent | bc4c853b490b1a230c9018df60670583be121009 (diff) | |
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 <[email protected]>
Reviewed-by: Tomeu Vizoso <[email protected]>
Diffstat (limited to 'src/panfrost/midgard')
| -rw-r--r-- | src/panfrost/midgard/midgard_compile.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; |