commit 2aa48bb5a8dbf3cc6584011ee2b869c586402d34
author Icecream95 <ixn@keemail.me> Sun Sep 20 15:30:45 2020 +1200
committer Marge Bot <eric+marge@anholt.net> Thu Sep 24 12:43:19 2020 +0000
tree 8dd491e8293cc3f91bda67dc78346884c4413150
parent 939ddf3f67de2ed1700c093e60cf95c1b72ff20b

panfrost: Clamp uniform buffer size

Issue (57) for the ARB_uniform_buffer_object spec states:
    "The uniform buffer could be larger than the amount of uniform
    block(s) data inside it."

This means we need to clamp the uniform buffer size in case it is
bigger than what hardware supports.

Fixes the OpenGL 3.3 renderer of GZDoom.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6835>

src/gallium/drivers/panfrost/pan_cmdstream.c

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index b15e6b8..45ce989 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -905,8 +905,12 @@
                         continue;
                 }
 
+                /* Issue (57) for the ARB_uniform_buffer_object spec says that
+                 * the buffer can be larger than the uniform data inside it,
+                 * so clamp ubo size to what hardware supports. */
+
                 pan_pack(ubo_ptr + ubo, UNIFORM_BUFFER, cfg) {
-                        cfg.entries = DIV_ROUND_UP(usz, 16);
+                        cfg.entries = MIN2(DIV_ROUND_UP(usz, 16), 1 << 12);
                         cfg.pointer = panfrost_map_constant_buffer_gpu(batch,
                                         stage, buf, ubo);
                 }