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

etnaviv: Drop not needed check if seamless cube map is supported

Browse Source 
With commit f2506780c8 ("mesa/st: Only set seamless for GLES3") ss->seamless_cube_map
should behave as wanted. For GLES2 it can only be set when PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE
is supported.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28669>
This commit is contained in:
Christian Gmeiner
2024-04-09 17:11:19 +02:00
committed by Marge Bot
parent 429f953d8f
commit 12059eedfe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/etnaviv/etnaviv_texture_state.c
View File

@@ -87,7 +87,6 @@ etna_create_sampler_state_state(struct pipe_context *pipe,
{
struct etna_sampler_state *cs = CALLOC_STRUCT(etna_sampler_state);
struct etna_context *ctx = etna_context(pipe);
struct etna_screen *screen = ctx->screen;
const bool ansio = ss->max_anisotropy > 1;
const bool mipmap = ss->min_mip_filter != PIPE_TEX_MIPFILTER_NONE;
@@ -110,8 +109,8 @@ etna_create_sampler_state_state(struct pipe_context *pipe,
cs->config0 |= VIVS_TE_SAMPLER_CONFIG0_ROUND_UV;
}
cs->config1 = screen->specs.seamless_cube_map ?
COND(ss->seamless_cube_map, VIVS_TE_SAMPLER_CONFIG1_SEAMLESS_CUBE_MAP) : 0;
cs->config1 =
COND(ss->seamless_cube_map, VIVS_TE_SAMPLER_CONFIG1_SEAMLESS_CUBE_MAP);
cs->config_lod =
COND(ss->lod_bias != 0.0 && mipmap, VIVS_TE_SAMPLER_LOD_CONFIG_BIAS_ENABLE) |