fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 10:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

etnaviv: fix nearest_linear / linear_nearest filtering on GC3000

Browse source 
The MIN filter is never used when not using mipmaps. This fixes that.

Interestingly, only GC3000 needs this (GC2000 works without this fix).

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Jonathan Marek 2019-06-19 11:43:54 -04:00
parent 63efb6ec6c
commit 2c393053bf
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/etnaviv/etnaviv_texture_state.c
View file

@ -77,6 +77,12 @@ etna_create_sampler_state_state(struct pipe_context *pipe,
cs->min_lod = cs->max_lod = etna_float_to_fixp55(ss->min_lod);
}
/* if max_lod is 0, MIN filter will never be used (GC3000)
* when min filter is different from mag filter, we need HW to compute LOD
* the workaround is to set max_lod to at least 1
*/
cs->max_lod_min = (ss->min_img_filter != ss->mag_img_filter) ? 1 : 0;
return cs;
}
@ -284,10 +290,12 @@ etna_emit_texture_state(struct etna_context *ctx)
ss = etna_sampler_state(ctx->sampler[x]);
sv = etna_sampler_view(ctx->sampler_view[x]);
unsigned max_lod = MAX2(MIN2(ss->max_lod, sv->max_lod), ss->max_lod_min);
/* min and max lod is determined both by the sampler and the view */
/*020C0*/ EMIT_STATE(TE_SAMPLER_LOD_CONFIG(x),
ss->TE_SAMPLER_LOD_CONFIG |
VIVS_TE_SAMPLER_LOD_CONFIG_MAX(MIN2(ss->max_lod, sv->max_lod)) |
VIVS_TE_SAMPLER_LOD_CONFIG_MAX(max_lod) |
VIVS_TE_SAMPLER_LOD_CONFIG_MIN(MAX2(ss->min_lod, sv->min_lod)));
}
}

2
src/gallium/drivers/etnaviv/etnaviv_texture_state.h
View file

@ -43,7 +43,7 @@ struct etna_sampler_state {
uint32_t TE_SAMPLER_CONFIG0;
uint32_t TE_SAMPLER_CONFIG1;
uint32_t TE_SAMPLER_LOD_CONFIG;
unsigned min_lod, max_lod;
unsigned min_lod, max_lod, max_lod_min;
};
static inline struct etna_sampler_state *