summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2019-12-23 14:40:59 +0100
committerChristian Gmeiner <christian.gmeiner@gmail.com>2019-12-31 15:12:49 +0000
commit5e9106f7af50e3652fb3bbdba53fc069c7d8eb5e (patch)
tree197e854481b21c2ed4e8e79253cb52e57f78583e
parenta812cb57e51a9c86a8184e24272a2bcd11920c21 (diff)
etnaviv: Do not filter out PIPE_FORMAT_S8_UINT_Z24_UNORM on pre-HALTI2
The format PIPE_FORMAT_S8_UINT_Z24_UNORM is supported even on pre-HALTI hardware like GCnano. Do not report it as unsupported format. This fixes the following dEQP on GCnano: dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.depth_stencil_unsigned_int_24_8 Fixes: 64c7cdcae51 ("etnaviv: add missing formats") Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3200> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3200>
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_screen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 9f9248eceba..e847d26aa7f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -408,7 +408,8 @@ gpu_supports_texture_format(struct etna_screen *screen, uint32_t fmt,
if (util_format_is_snorm(format))
supported = VIV_FEATURE(screen, chipMinorFeatures2, HALTI1);
- if (util_format_is_pure_integer(format) || util_format_is_float(format))
+ if (format != PIPE_FORMAT_S8_UINT_Z24_UNORM &&
+ (util_format_is_pure_integer(format) || util_format_is_float(format)))
supported = VIV_FEATURE(screen, chipMinorFeatures4, HALTI2);