Mesa (main): mesa/st: make get_sampler_view_format() public

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jun 22 09:14:11 2022 -0400

mesa/st: make get_sampler_view_format() public

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17189>

---

 src/mesa/state_tracker/st_sampler_view.c | 14 +++++++-------
 src/mesa/state_tracker/st_sampler_view.h |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/mesa/state_tracker/st_sampler_view.c b/src/mesa/state_tracker/st_sampler_view.c
index c3f665b7921..3ed117e75ac 100644
--- a/src/mesa/state_tracker/st_sampler_view.c
+++ b/src/mesa/state_tracker/st_sampler_view.c
@@ -507,10 +507,10 @@ last_layer(const struct gl_texture_object *texObj)
 /**
  * Determine the format for the texture sampler view.
  */
-static enum pipe_format
-get_sampler_view_format(struct st_context *st,
-                        const struct gl_texture_object *texObj,
-                        bool srgb_skip_decode)
+enum pipe_format
+st_get_sampler_view_format(const struct st_context *st,
+                           const struct gl_texture_object *texObj,
+                           bool srgb_skip_decode)
 {
    enum pipe_format format;
 
@@ -647,7 +647,7 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st,
       struct pipe_sampler_view *view = sv->view;
       assert(texObj->pt == view->texture);
       assert(!check_sampler_swizzle(st, texObj, view, glsl130_or_later));
-      assert(get_sampler_view_format(st, texObj, srgb_skip_decode) == view->format);
+      assert(st_get_sampler_view_format(st, texObj, srgb_skip_decode) == view->format);
       assert(gl_target_to_pipe(texObj->Target) == view->target);
       assert(texObj->level_override >= 0 ||
              texObj->Attrib.MinLevel +
@@ -666,8 +666,8 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st,
    }
 
    /* create new sampler view */
-   enum pipe_format format = get_sampler_view_format(st, texObj,
-                                                     srgb_skip_decode);
+   enum pipe_format format = st_get_sampler_view_format(st, texObj,
+                                                        srgb_skip_decode);
    struct pipe_sampler_view *view =
          st_create_texture_sampler_view_from_stobj(st, texObj, format,
                                                    glsl130_or_later);
diff --git a/src/mesa/state_tracker/st_sampler_view.h b/src/mesa/state_tracker/st_sampler_view.h
index cfa7480f8e7..c7c9f60c311 100644
--- a/src/mesa/state_tracker/st_sampler_view.h
+++ b/src/mesa/state_tracker/st_sampler_view.h
@@ -83,4 +83,9 @@ st_get_buffer_sampler_view_from_stobj(struct st_context *st,
                                       struct gl_texture_object *stObj,
                                       bool get_reference);
 
+enum pipe_format
+st_get_sampler_view_format(const struct st_context *st,
+                           const struct gl_texture_object *texObj,
+                           bool srgb_skip_decode);
+
 #endif /* ST_SAMPLER_VIEW_H */