diff options
| author | Jonathan Marek <jonathan@marek.ca> | 2019-07-01 16:42:50 -0400 |
|---|---|---|
| committer | Jonathan Marek <jonathan@marek.ca> | 2019-07-04 14:05:18 -0400 |
| commit | 66411521ea9394132c6067f5b676dc2751f21d6c (patch) | |
| tree | 2720dc65ed0e5c04cd76bd7c4f0aeb09cf9a152e /src/gallium/drivers/etnaviv/etnaviv_texture.c | |
| parent | 84c87f40fbd4733d59bd8ff218d0ab82730b5160 (diff) | |
etnaviv: combine translate_ts_sampler_format/translate_msaa_format
Both translate the same thing, so just add the missing cases into one.
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Diffstat (limited to 'src/gallium/drivers/etnaviv/etnaviv_texture.c')
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture.c b/src/gallium/drivers/etnaviv/etnaviv_texture.c index 6965ee001ea..9bf63ec34c4 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture.c +++ b/src/gallium/drivers/etnaviv/etnaviv_texture.c @@ -86,7 +86,7 @@ etna_configure_sampler_ts(struct etna_sampler_ts *sts, struct pipe_sampler_view sts->mode = lev->ts_mode; sts->TS_SAMPLER_CONFIG = VIVS_TS_SAMPLER_CONFIG_ENABLE | - VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT(translate_ts_sampler_format(rsc->base.format)); + VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT(translate_ts_format(rsc->base.format)); sts->TS_SAMPLER_CLEAR_VALUE = lev->clear_value; sts->TS_SAMPLER_CLEAR_VALUE2 = lev->clear_value; /* To handle 64-bit formats this needs a different value */ sts->TS_SAMPLER_STATUS_BASE.bo = rsc->ts_bo; @@ -123,7 +123,7 @@ etna_can_use_sampler_ts(struct pipe_sampler_view *view, int num) return VIV_FEATURE(screen, chipMinorFeatures2, TEXTURE_TILED_READ) && num < VIVS_TS_SAMPLER__LEN && rsc->base.target != PIPE_BUFFER && - translate_ts_sampler_format(rsc->base.format) != ETNA_NO_MATCH && + translate_ts_format(rsc->base.format) != ETNA_NO_MATCH && view->u.tex.first_level == 0 && MIN2(view->u.tex.last_level, rsc->base.last_level) == 0 && rsc->levels[0].ts_valid; } |