aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
diff options
context:
space:
mode:
authorChristian GMEINER <[email protected]>2019-08-19 17:07:29 +0200
committerChristian Gmeiner <[email protected]>2019-08-19 22:36:45 +0200
commit7492685b1be0f1300ba910de07d0f409bddf3be3 (patch)
tree61496d136cf87ed034a9ad1429db75a52913034c /src/gallium/drivers/etnaviv/etnaviv_texture_state.c
parent1395503424391db4aba05bd68a8288f426992d56 (diff)
etnaviv: update headers from rnndb
Update to etna_viv commit c51353e. Signed-off-by: Christian GMEINER <[email protected]> Reviewed-by: Philipp Zabel <[email protected]> Reviewed-by: Jonathan Marek <[email protected]>
Diffstat (limited to 'src/gallium/drivers/etnaviv/etnaviv_texture_state.c')
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_texture_state.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
index 5b3fbf46bf4..3937560b721 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
@@ -104,6 +104,7 @@ etna_create_sampler_view_state(struct pipe_context *pctx, struct pipe_resource *
const uint32_t format = translate_texture_format(so->format);
const bool ext = !!(format & EXT_FORMAT);
const bool astc = !!(format & ASTC_FORMAT);
+ const bool srgb = util_format_is_srgb(so->format);
const uint32_t swiz = get_texture_swiz(so->format, so->swizzle_r,
so->swizzle_g, so->swizzle_b,
so->swizzle_a);
@@ -172,6 +173,7 @@ etna_create_sampler_view_state(struct pipe_context *pctx, struct pipe_resource *
COND(is_array, VIVS_TE_SAMPLER_CONFIG1_TEXTURE_ARRAY) |
VIVS_TE_SAMPLER_CONFIG1_HALIGN(res->halign) | swiz;
sv->TE_SAMPLER_ASTC0 = COND(astc, VIVS_NTE_SAMPLER_ASTC0_ASTC_FORMAT(format)) |
+ COND(astc && srgb, VIVS_NTE_SAMPLER_ASTC0_ASTC_SRGB) |
VIVS_NTE_SAMPLER_ASTC0_UNK8(0xc) |
VIVS_NTE_SAMPLER_ASTC0_UNK16(0xc) |
VIVS_NTE_SAMPLER_ASTC0_UNK24(0xc);