From 53d04c4f8b0646f2103be2175c8322a00f030c55 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Tue, 13 Jul 2021 23:12:13 -0700 Subject: [PATCH] lima: handle fp16 vertex formats 12128fb1351e marked fp16 vertex formats supported, but they aren't actually handled by lima_pipe_format_to_attrib_type(). Fix it by handling it there. FP16 seems to be the only missing index which is 0x3. Fixes: 12128fb1351e ("lima: add natively supported vertex buffer formats") Cc: 21.1 mesa-stable Reviewed-by: Alyssa Rosenzweig Signed-off-by: Vasily Khoruzhick Part-of: (cherry picked from commit 4a3269dff65e198ac3d493b676800978ce0c01e5) --- .pick_status.json | 2 +- src/gallium/drivers/lima/lima_draw.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3e17047cf76..d32f7959278 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1885,7 +1885,7 @@ "description": "lima: handle fp16 vertex formats", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "12128fb1351eee6ec681039fe8483b3c39db7c8e" }, diff --git a/src/gallium/drivers/lima/lima_draw.c b/src/gallium/drivers/lima/lima_draw.c index fc218eea544..04ec868964b 100644 --- a/src/gallium/drivers/lima/lima_draw.c +++ b/src/gallium/drivers/lima/lima_draw.c @@ -195,6 +195,7 @@ enum lima_attrib_type { LIMA_ATTRIB_FLOAT = 0x000, LIMA_ATTRIB_I32 = 0x001, LIMA_ATTRIB_U32 = 0x002, + LIMA_ATTRIB_FP16 = 0x003, LIMA_ATTRIB_I16 = 0x004, LIMA_ATTRIB_U16 = 0x005, LIMA_ATTRIB_I8 = 0x006, @@ -217,7 +218,10 @@ lima_pipe_format_to_attrib_type(enum pipe_format format) switch (c->type) { case UTIL_FORMAT_TYPE_FLOAT: - return LIMA_ATTRIB_FLOAT; + if (c->size == 16) + return LIMA_ATTRIB_FP16; + else + return LIMA_ATTRIB_FLOAT; case UTIL_FORMAT_TYPE_FIXED: return LIMA_ATTRIB_FIXED; case UTIL_FORMAT_TYPE_SIGNED: