diff options
| author | Brian Paul <[email protected]> | 2018-08-03 06:28:34 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-08-08 08:20:10 -0600 |
| commit | 51e878cdb3bf05a7818fce701b66ad7e3d9e9687 (patch) | |
| tree | 74a9328eb11c168fe4c191b5189cc662bd6a1054 | |
| parent | 92e5dc94acbed3d08a2d2e29ed6f219569efc1cd (diff) | |
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 <[email protected]>
Reviewed-by: Charmaine Lee <[email protected]>
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_sampler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c index e9d1d6f4527..4c38092078c 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) |