fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 21:21:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

etnaviv: fix compression format not set correctly in TS_MEM_CONFIG

Browse source 
VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT() needs to be used.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Jonathan Marek 2019-07-01 16:29:40 -04:00
parent 53475c85fd
commit 84c87f40fb
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/etnaviv/etnaviv_rs.c
View file

@ -657,7 +657,8 @@ etna_try_rs_blit(struct pipe_context *pctx,
if (src->base.nr_samples > 1) {
uint32_t msaa_format = translate_msaa_format(src_format);
assert(msaa_format != ETNA_NO_MATCH);
ts_mem_config |= VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION | msaa_format;
ts_mem_config |= VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION |
VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT(msaa_format);
}
/* Always flush color and depth cache together before resolving. This works

6
src/gallium/drivers/etnaviv/etnaviv_state.c
View file

@ -179,9 +179,11 @@ etna_set_framebuffer_state(struct pipe_context *pctx,
}
/* MSAA */
if (cbuf->base.texture->nr_samples > 1)
if (cbuf->base.texture->nr_samples > 1) {
ts_mem_config |=
VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION | translate_msaa_format(cbuf->base.format);
VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION |
VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT(translate_msaa_format(cbuf->base.format));
}
nr_samples_color = cbuf->base.texture->nr_samples;
} else {