From: Dave Airlie <airlied@redhat.com>
Date: Fri, 10 Apr 2020 03:27:09 +0000 (+1000)
Subject: u_blitter: fix stencil blitting
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bf8e923863230914f6bf2a4abcf257cb8778ee7;p=mesa.git

u_blitter: fix stencil blitting

Fixes: KHR-GL45.packed_depth_stencil.blit.depth32f_stencil8

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4560>
---

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index 983307ead73..5faa8942be3 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -417,7 +417,7 @@ util_make_fs_blit_zs(struct pipe_context *pipe, unsigned zs_mask,
 
    if (zs_mask & PIPE_MASK_S) {
       stencil_sampler = ureg_DECL_sampler(ureg, zs_mask & PIPE_MASK_Z ? 1 : 0);
-      ureg_DECL_sampler_view(ureg, 0, tex_target,
+      ureg_DECL_sampler_view(ureg, zs_mask & PIPE_MASK_Z ? 1 : 0, tex_target,
                              TGSI_RETURN_TYPE_UINT,
                              TGSI_RETURN_TYPE_UINT,
                              TGSI_RETURN_TYPE_UINT,