OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: make get_sampler_view_format() public

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17189>
This commit is contained in:
Mike Blumenkrantz
2022-06-22 09:14:11 -04:00
committed by Marge Bot
parent ec2e8bc33f
commit ad0ee7ad42
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/state_tracker/st_sampler_view.c
View File

@@ -507,10 +507,10 @@ last_layer(const struct gl_texture_object *texObj)
/** /**
* Determine the format for the texture sampler view. * Determine the format for the texture sampler view.
*/ */
static enum pipe_format enum pipe_format
get_sampler_view_format(struct st_context *st, st_get_sampler_view_format(const struct st_context *st,
const struct gl_texture_object *texObj, const struct gl_texture_object *texObj,
bool srgb_skip_decode) bool srgb_skip_decode)
{ {
enum pipe_format format; 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; struct pipe_sampler_view *view = sv->view;
assert(texObj->pt == view->texture); assert(texObj->pt == view->texture);
assert(!check_sampler_swizzle(st, texObj, view, glsl130_or_later)); 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(gl_target_to_pipe(texObj->Target) == view->target);
assert(texObj->level_override >= 0 || assert(texObj->level_override >= 0 ||
texObj->Attrib.MinLevel + texObj->Attrib.MinLevel +
@@ -666,8 +666,8 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st,
} }
/* create new sampler view */ /* create new sampler view */
enum pipe_format format = get_sampler_view_format(st, texObj, enum pipe_format format = st_get_sampler_view_format(st, texObj,
srgb_skip_decode); srgb_skip_decode);
struct pipe_sampler_view *view = struct pipe_sampler_view *view =
st_create_texture_sampler_view_from_stobj(st, texObj, format, st_create_texture_sampler_view_from_stobj(st, texObj, format,
glsl130_or_later); glsl130_or_later);

5
src/mesa/state_tracker/st_sampler_view.h
View File

@@ -83,4 +83,9 @@ st_get_buffer_sampler_view_from_stobj(struct st_context *st,
struct gl_texture_object *stObj, struct gl_texture_object *stObj,
bool get_reference); 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 */ #endif /* ST_SAMPLER_VIEW_H */