summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2021-01-21 15:50:38 +0100
committerMarge Bot <emma+marge@anholt.net>2022-04-27 09:10:27 +0000
commitab942aaed0fe76f3c781dcc16daf9ed3a7f0736b (patch)
tree9ec15110c15f7611bc5975d599f42f89d8fd154a
parentf525706e7725345e187f076118feb3937dfb8c43 (diff)
etnaviv: don't supertile textures if supertiling is disabled via debug option
The debug option only disables the general can_supertile spec of the GPU, so we should also take this into account when deciding about the layout of a sampler resource. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9255>
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_resource.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 6f77b829151..20e0c730f1e 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -348,7 +348,8 @@ etna_resource_create(struct pipe_screen *pscreen,
layout |= ETNA_LAYOUT_BIT_MULTI;
if (screen->specs.can_supertile)
layout |= ETNA_LAYOUT_BIT_SUPER;
- } else if (VIV_FEATURE(screen, chipMinorFeatures2, SUPERTILED_TEXTURE) &&
+ } else if (screen->specs.can_supertile &&
+ VIV_FEATURE(screen, chipMinorFeatures2, SUPERTILED_TEXTURE) &&
etna_resource_hw_tileable(screen->specs.use_blt, templat)) {
layout |= ETNA_LAYOUT_BIT_SUPER;
}