Mesa (master): svga: use pipe_sampler_view::target in svga_set_sampler_views()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 51e878cdb3bf05a7818fce701b66ad7e3d9e9687
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51e878cdb3bf05a7818fce701b66ad7e3d9e9687

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Aug  3 06:28:34 2018 -0600

svga: use pipe_sampler_view::target in svga_set_sampler_views()

instead of the underlying texture's target.  This fixes an issue
where the TGSI sampler type was not agreeing with the sampler view
target/type.  In particular, this fixes a Mint 19 XFCE desktop
scaling issue because the TGSI code was using a RECT sampler but
the sampler view's underlying texture was PIPE_TEXTURE_2D.

We want to use the sampler view's type rather than the underlying
resource, as we do for the view's surface format.

No piglit regressions.

VMware issue 2156696.

Reviewed-by: Neha Bhende <bhenden at vmware.com>
Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/gallium/drivers/svga/svga_pipe_sampler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c
index e9d1d6f452..4c38092078 100644
--- a/src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/src/gallium/drivers/svga/svga_pipe_sampler.c
@@ -492,7 +492,7 @@ svga_set_sampler_views(struct pipe_context *pipe,
       if (util_format_is_srgb(views[i]->format))
          flag_srgb |= 1 << (start + i);
 
-      target = views[i]->texture->target;
+      target = views[i]->target;
       if (target == PIPE_TEXTURE_1D)
          flag_1d |= 1 << (start + i);
       else if (target == PIPE_TEXTURE_RECT)