Mesa (main): st/mesa: return sview from st_update_single_texture via return value, not param

[GitLab Mirror]

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

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

st/mesa: return sview from st_update_single_texture via return value, not param

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 | 32 ++++++++++++--------------------
 src/mesa/state_tracker/st_texture.c      |  2 +-
 src/mesa/state_tracker/st_texture.h      |  3 +--
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 6a003278cab..f6ef7fa7ed3 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -55,9 +55,8 @@
 /**
  * Get a pipe_sampler_view object from a texture unit.
  */
-void
+struct pipe_sampler_view *
 st_update_single_texture(struct st_context *st,
-                         struct pipe_sampler_view **sampler_view,
                          GLuint texUnit, bool glsl130_or_later,
                          bool ignore_srgb_decode)
 {
@@ -71,27 +70,20 @@ st_update_single_texture(struct st_context *st,
    stObj = st_texture_object(texObj);
    GLenum target = texObj->Target;
 
-   if (unlikely(target == GL_TEXTURE_BUFFER)) {
-      *sampler_view = st_get_buffer_sampler_view_from_stobj(st, stObj);
-      return;
-   }
+   if (unlikely(target == GL_TEXTURE_BUFFER))
+      return st_get_buffer_sampler_view_from_stobj(st, stObj);
 
-   if (!st_finalize_texture(ctx, st->pipe, texObj, 0) ||
-       !stObj->pt) {
-      /* out of mem */
-      *sampler_view = NULL;
-      return;
-   }
+   if (!st_finalize_texture(ctx, st->pipe, texObj, 0) || !stObj->pt)
+      return NULL; /* out of mem */
 
    if (target == GL_TEXTURE_EXTERNAL_OES &&
        stObj->pt->screen->resource_changed)
          stObj->pt->screen->resource_changed(stObj->pt->screen, stObj->pt);
 
-   *sampler_view =
-      st_get_texture_sampler_view_from_stobj(st, stObj,
-                                             _mesa_get_samplerobj(ctx, texUnit),
-                                             glsl130_or_later,
-                                             ignore_srgb_decode);
+   return st_get_texture_sampler_view_from_stobj(st, stObj,
+                                                 _mesa_get_samplerobj(ctx, texUnit),
+                                                 glsl130_or_later,
+                                                 ignore_srgb_decode);
 }
 
 
@@ -154,9 +146,9 @@ st_get_sampler_views(struct st_context *st,
        * So we simply ignore the setting entirely for samplers that are
        * (statically) accessed with a texelFetch function.
        */
-      struct pipe_sampler_view *sampler_view;
-      st_update_single_texture(st, &sampler_view, prog->SamplerUnits[unit],
-                               glsl130, texel_fetch_samplers & bit);
+      struct pipe_sampler_view *sampler_view =
+         st_update_single_texture(st, prog->SamplerUnits[unit], glsl130,
+                                  texel_fetch_samplers & bit);
       sampler_views[unit] = NULL;
       pipe_sampler_view_reference(&sampler_views[unit], sampler_view);
    }
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index fbe5534690c..f91310d23ff 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -519,7 +519,7 @@ st_create_texture_handle_from_unit(struct st_context *st,
    struct pipe_sampler_state sampler = {0};
 
    /* TODO: Clarify the interaction of ARB_bindless_texture and EXT_texture_sRGB_decode */
-   st_update_single_texture(st, &view, texUnit, prog->sh.data->Version >= 130, true);
+   view = st_update_single_texture(st, texUnit, prog->sh.data->Version >= 130, true);
    if (!view)
       return 0;
 
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 960c88a3728..be92ae0ad98 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -356,9 +356,8 @@ st_convert_sampler_from_unit(const struct st_context *st,
                              struct pipe_sampler_state *sampler,
                              GLuint texUnit);
 
-void
+struct pipe_sampler_view *
 st_update_single_texture(struct st_context *st,
-                         struct pipe_sampler_view **sampler_view,
                          GLuint texUnit, bool glsl130_or_later,
                          bool ignore_srgb_decode);