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

mesa/st: add ignore_srgb_decode param to st_convert_sampler

Browse Source 
same as st_get_texture_sampler_view_from_stobj, no functional changes

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17687>
This commit is contained in:
Mike Blumenkrantz
2022-07-21 09:27:30 -04:00
committed by Marge Bot
parent 28d033b34f
commit d1e33fa345
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/texturebindless.c
View File

@@ -233,7 +233,7 @@ new_texture_handle(struct gl_context *ctx, struct gl_texture_object *texObj,
if (!st_finalize_texture(ctx, pipe, texObj, 0)) if (!st_finalize_texture(ctx, pipe, texObj, 0))
return 0; return 0;
st_convert_sampler(st, texObj, sampObj, 0, &sampler, false); st_convert_sampler(st, texObj, sampObj, 0, &sampler, false, false);
/* TODO: Clarify the interaction of ARB_bindless_texture and EXT_texture_sRGB_decode */ /* TODO: Clarify the interaction of ARB_bindless_texture and EXT_texture_sRGB_decode */
view = st_get_texture_sampler_view_from_stobj(st, texObj, sampObj, 0, view = st_get_texture_sampler_view_from_stobj(st, texObj, sampObj, 0,

5
src/mesa/state_tracker/st_atom_sampler.c
View File

@@ -61,7 +61,8 @@ st_convert_sampler(const struct st_context *st,
const struct gl_sampler_object *msamp, const struct gl_sampler_object *msamp,
float tex_unit_lod_bias, float tex_unit_lod_bias,
struct pipe_sampler_state *sampler, struct pipe_sampler_state *sampler,
bool seamless_cube_map) bool seamless_cube_map,
bool ignore_srgb_decode)
{ {
memcpy(sampler, &msamp->Attrib.state, sizeof(*sampler)); memcpy(sampler, &msamp->Attrib.state, sizeof(*sampler));
@@ -163,7 +164,7 @@ st_convert_sampler_from_unit(const struct st_context *st,
msamp = _mesa_get_samplerobj(ctx, texUnit); msamp = _mesa_get_samplerobj(ctx, texUnit);
st_convert_sampler(st, texobj, msamp, ctx->Texture.Unit[texUnit].LodBiasQuantized, st_convert_sampler(st, texobj, msamp, ctx->Texture.Unit[texUnit].LodBiasQuantized,
sampler, ctx->Texture.CubeMapSeamless); sampler, ctx->Texture.CubeMapSeamless, true);
} }

3
src/mesa/state_tracker/st_texture.h
View File

@@ -239,7 +239,8 @@ st_convert_sampler(const struct st_context *st,
const struct gl_sampler_object *msamp, const struct gl_sampler_object *msamp,
float tex_unit_lod_bias, float tex_unit_lod_bias,
struct pipe_sampler_state *sampler, struct pipe_sampler_state *sampler,
bool seamless_cube_map); bool seamless_cube_map,
bool ignore_srgb_decode);
void void
st_convert_sampler_from_unit(const struct st_context *st, st_convert_sampler_from_unit(const struct st_context *st,