From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 21 Aug 2020 20:27:17 +0000 (-0400)
Subject: panfrost: Use pack for Bifrost test state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7b2317d0a06c0c4c7f0fb2d7ab0c72f68ce6383;p=mesa.git

panfrost: Use pack for Bifrost test state

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6440>
---

diff --git a/src/panfrost/bifrost/test/bi_submit.c b/src/panfrost/bifrost/test/bi_submit.c
index 2bccbb578ec..453d9dea51d 100644
--- a/src/panfrost/bifrost/test/bi_submit.c
+++ b/src/panfrost/bifrost/test/bi_submit.c
@@ -171,18 +171,13 @@ bit_vertex(struct panfrost_device *dev, panfrost_program prog,
 
         memcpy(shmem->cpu, &shmemp, sizeof(shmemp));
 
-        struct mali_shader_meta meta = {
-                .shader = { .opaque = { 
-                        (uint32_t) shader->gpu & 0xFFFFFFFF, /* PC lo */
-                        (uint32_t) (shader->gpu >> 32ull), /* PC hi */
-                        (uint32_t) (1 << 16) | 1, /* attr/vary */
-                        (uint32_t) 0, /* tex/sampl */
-                } },
-                .bifrost_props = { .opaque = { 0x80020001 } },
-                .bifrost_preload = { .opaque = { (sz_ubo / 16) << 15 } },
-        };
+        pan_pack(shader_desc->cpu, STATE, cfg) {
+                cfg.shader.shader = shader->gpu;
+                cfg.shader.attribute_count = cfg.shader.varying_count = 1;
+                cfg.properties = 0x80020001;
+                cfg.preload.uniform_count = (sz_ubo / 16);
+        }
 
-        memcpy(shader_desc->cpu, &meta, sizeof(meta));
         memcpy(shader->cpu, prog.compiled.data, prog.compiled.size);
 
         struct bifrost_payload_vertex payload = {