AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: Don't use panfrost_get_default_swizzle() on v7+

Browse Source 
This helper produces invalid component order values on v7. Use the
MALI_RGB_COMPONENT_ORDER_xxx definitions instead.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13136>
This commit is contained in:
Boris Brezillon
2021-09-30 10:52:07 +02:00
committed by Marge Bot
parent 8acc8f6a0e
commit 4692baacfb
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/vulkan/panvk_vX_cs.c
+9
View File
@@ -110,10 +110,19 @@ panvk_varying_hw_format(const struct panvk_device *dev,
switch (loc) {
case VARYING_SLOT_PNTC:
case VARYING_SLOT_PSIZ:
#if PAN_ARCH <= 6
return (MALI_R16F << 12) | panfrost_get_default_swizzle(1);
#else
return (MALI_R16F << 12) | MALI_RGB_COMPONENT_ORDER_R000;
#endif
case VARYING_SLOT_POS:
#if PAN_ARCH <= 6
return ((fs ? MALI_RGBA32F : MALI_SNAP_4) << 12) |
panfrost_get_default_swizzle(4);
#else
return ((fs ? MALI_RGBA32F : MALI_SNAP_4) << 12) |
MALI_RGB_COMPONENT_ORDER_RGBA;
#endif
default:
assert(!panvk_varying_is_builtin(stage, loc));
if (varyings->varying[loc].format != PIPE_FORMAT_NONE)