panfrost: Lower max inputs again
authorAlyssa Rosenzweig <alyssa@collabora.com>
Fri, 21 May 2021 21:30:34 +0000 (17:30 -0400)
committerMarge Bot <eric+marge@anholt.net>
Tue, 25 May 2021 12:55:15 +0000 (12:55 +0000)
Due to Midgard ABI silliness. We could fix this properly but I'm not
aware of any app that needs more than 16, so let's just revert to the
behaviour matching the DDK.

Fixes: fdbf8c96fe2 ("panfrost: Use natural shader limits")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10938>

src/gallium/drivers/panfrost/pan_screen.c

index aee8241..d3d2323 100644 (file)
@@ -347,9 +347,8 @@ panfrost_get_shader_param(struct pipe_screen *screen,
                 return 1024; /* arbitrary */
 
         case PIPE_SHADER_CAP_MAX_INPUTS:
-                /* Hardware limit is 4095 but we have driver internal inputs */
-                STATIC_ASSERT(PIPE_MAX_ATTRIBS < (0x1000 - 16));
-                return PIPE_MAX_ATTRIBS;
+                /* Used as ABI on Midgard */
+                return 16;
 
         case PIPE_SHADER_CAP_MAX_OUTPUTS:
                 return shader == PIPE_SHADER_FRAGMENT ? 8 : PIPE_MAX_ATTRIBS;