Mesa (main): st/mesa: sink _mesa_get_samplerobj into st_update_single_texture

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fc9d1660b70294383776cd55a2aa74052e78135a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc9d1660b70294383776cd55a2aa74052e78135a

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Jun  6 04:42:03 2021 -0400

st/mesa: sink _mesa_get_samplerobj into st_update_single_texture

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11428>

---

 src/mesa/state_tracker/st_atom_texture.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 8fda6ec2467..533fda003b4 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -62,12 +62,9 @@ st_update_single_texture(struct st_context *st,
                          bool ignore_srgb_decode)
 {
    struct gl_context *ctx = st->ctx;
-   const struct gl_sampler_object *samp;
    struct gl_texture_object *texObj;
    struct st_texture_object *stObj;
 
-   samp = _mesa_get_samplerobj(ctx, texUnit);
-
    texObj = ctx->Texture.Unit[texUnit]._Current;
    assert(texObj);
 
@@ -90,7 +87,8 @@ st_update_single_texture(struct st_context *st,
          stObj->pt->screen->resource_changed(stObj->pt->screen, stObj->pt);
 
    *sampler_view =
-      st_get_texture_sampler_view_from_stobj(st, stObj, samp,
+      st_get_texture_sampler_view_from_stobj(st, stObj,
+                                             _mesa_get_samplerobj(ctx, texUnit),
                                              glsl130_or_later,
                                              ignore_srgb_decode);
 }