From 12059eedfe8488f677ede92695bb9d2435bedfd0 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Tue, 9 Apr 2024 17:11:19 +0200 Subject: [PATCH] etnaviv: Drop not needed check if seamless cube map is supported With commit f2506780c8a ("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 Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_texture_state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c index 274c7e56183..6844a83c0e0 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c @@ -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) |