vc4: Convert the driver to emitting the shader record using pack macros.

1 files changed, 37 insertions, 10 deletions

diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h
index 966756f5038..c9a988e85b8 100644
--- a/src/gallium/drivers/vc4/vc4_cl.h
+++ b/src/gallium/drivers/vc4/vc4_cl.h
@@ -29,10 +29,9 @@
 #include "util/u_math.h"
 #include "util/macros.h"
 
-#include "kernel/vc4_packet.h"
-
 struct vc4_bo;
 struct vc4_job;
+struct vc4_cl;
 
 /**
  * Undefined structure, used for typechecking that you're passing the pointers
@@ -46,14 +45,9 @@ struct vc4_cl_reloc {
         uint32_t offset;
 };
 
-/* We don't call anything that packs a reloc yet, so don't implement it. */
-static inline void cl_pack_emit_reloc(void *cl, const struct vc4_cl_reloc *reloc)
-{
-        abort();
-}
+static inline void cl_pack_emit_reloc(struct vc4_cl *cl, const struct vc4_cl_reloc *);
 
-/* We don't use the data arg yet */
-#define __gen_user_data void
+#define __gen_user_data struct vc4_cl
 #define __gen_address_type struct vc4_cl_reloc
 #define __gen_address_offset(reloc) ((reloc)->offset)
 #define __gen_emit_reloc cl_pack_emit_reloc
@@ -63,6 +57,7 @@ static inline void cl_pack_emit_reloc(void *cl, const struct vc4_cl_reloc *reloc
 
 struct vc4_cl {
         void *base;
+        struct vc4_job *job;
         struct vc4_cl_out *next;
         struct vc4_cl_out *reloc_next;
         uint32_t size;
@@ -71,7 +66,7 @@ struct vc4_cl {
 #endif
 };
 
-void vc4_init_cl(void *mem_ctx, struct vc4_cl *cl);
+void vc4_init_cl(struct vc4_job *job, struct vc4_cl *cl);
 void vc4_reset_cl(struct vc4_cl *cl);
 void vc4_dump_cl(void *cl, uint32_t size, bool is_render);
 uint32_t vc4_gem_hindex(struct vc4_job *job, struct vc4_bo *bo);
@@ -224,6 +219,19 @@ cl_aligned_reloc(struct vc4_job *job, struct vc4_cl *cl,
         cl_aligned_u32(cl_out, offset);
 }
 
+/**
+ * Reference to a BO with its associated offset, used in the pack process.
+ */
+static inline struct vc4_cl_reloc
+cl_address(struct vc4_bo *bo, uint32_t offset)
+{
+        struct vc4_cl_reloc reloc = {
+                .bo = bo,
+                .offset = offset,
+        };
+        return reloc;
+}
+
 void cl_ensure_space(struct vc4_cl *cl, uint32_t size);
 
 #define cl_packet_header(packet) V3D21_ ## packet ## _header
@@ -271,4 +279,23 @@ cl_get_emit_space(struct vc4_cl_out **cl, size_t size)
                 _loop_terminate = NULL;                          \
         }))                                                      \
 
+/**
+ * Helper function called by the XML-generated pack functions for filling in
+ * an address field in shader records.
+ *
+ * Relocations for shader recs and texturing involve the packet (or uniforms
+ * stream) being preceded by the handles to the BOs, and the offset within the
+ * BO being in the stream (the output of this function).
+ */
+static inline void
+cl_pack_emit_reloc(struct vc4_cl *cl, const struct vc4_cl_reloc *reloc)
+{
+        *(uint32_t *)cl->reloc_next = vc4_gem_hindex(cl->job, reloc->bo);
+        cl_advance(&cl->reloc_next, 4);
+
+#ifdef DEBUG
+        cl->reloc_count--;
+#endif
+}
+
 #endif /* VC4_CL_H */