panfrost: Extend the panfrost_batch_add_bo() API to pass access flags

[mesa.git] / src / gallium / drivers / panfrost / pan_job.h

diff --git a/src/gallium/drivers/panfrost/pan_job.h b/src/gallium/drivers/panfrost/pan_job.h
index 5e62c818f7107cf4ab92471e3eff9bb1398b0a77..0b37a3131e86800a609852c610ba4fb1e4c86835 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_job.h
+++ b/src/gallium/drivers/panfrost/pan_job.h
@@ -31,22 +31,15 @@
 #include "pan_allocate.h"
 #include "pan_resource.h"
 
-/* Used as a hash table key */
-
-struct panfrost_job_key {
-        struct pipe_surface *cbufs[4];
-        struct pipe_surface *zsbuf;
-};
-
 #define PAN_REQ_MSAA            (1 << 0)
 #define PAN_REQ_DEPTH_WRITE     (1 << 1)
 
-/* A panfrost_job corresponds to a bound FBO we're rendering to,
+/* A panfrost_batch corresponds to a bound FBO we're rendering to,
  * collecting over multiple draws. */
 
-struct panfrost_job {
+struct panfrost_batch {
         struct panfrost_context *ctx;
-        struct panfrost_job_key key;
+        struct pipe_framebuffer_state key;
 
         /* Buffers cleared (PIPE_CLEAR_* bitmask) */
         unsigned clear;
@@ -106,86 +99,114 @@ struct panfrost_job {
 
         /* BOs referenced -- will be used for flushing logic */
         struct set *bos;
+
+        /* Current transient BO */
+       struct panfrost_bo *transient_bo;
+
+        /* Within the topmost transient BO, how much has been used? */
+        unsigned transient_offset;
+
+        /* Polygon list bound to the batch, or NULL if none bound yet */
+        struct panfrost_bo *polygon_list;
+
+        /* Scratchpath BO bound to the batch, or NULL if none bound yet */
+        struct panfrost_bo *scratchpad;
+
+        /* Tiler heap BO bound to the batch, or NULL if none bound yet */
+        struct panfrost_bo *tiler_heap;
+
+        /* Dummy tiler BO bound to the batch, or NULL if none bound yet */
+        struct panfrost_bo *tiler_dummy;
+
+        /* Framebuffer descriptor. */
+        mali_ptr framebuffer;
 };
 
 /* Functions for managing the above */
 
-struct panfrost_job *
-panfrost_create_job(struct panfrost_context *ctx);
+struct panfrost_batch *
+panfrost_get_batch_for_fbo(struct panfrost_context *ctx);
 
 void
-panfrost_free_job(struct panfrost_context *ctx, struct panfrost_job *job);
+panfrost_batch_init(struct panfrost_context *ctx);
 
-struct panfrost_job *
-panfrost_get_job(struct panfrost_context *ctx,
-                 struct pipe_surface **cbufs, struct pipe_surface *zsbuf);
+void
+panfrost_batch_add_bo(struct panfrost_batch *batch, struct panfrost_bo *bo,
+                      uint32_t flags);
 
-struct panfrost_job *
-panfrost_get_job_for_fbo(struct panfrost_context *ctx);
+void panfrost_batch_add_fbo_bos(struct panfrost_batch *batch);
 
-void
-panfrost_job_init(struct panfrost_context *ctx);
+struct panfrost_bo *
+panfrost_batch_create_bo(struct panfrost_batch *batch, size_t size,
+                         uint32_t create_flags, uint32_t access_flags);
 
 void
-panfrost_job_add_bo(struct panfrost_job *job, struct panfrost_bo *bo);
+panfrost_batch_submit(struct panfrost_batch *batch);
 
 void
-panfrost_flush_jobs_writing_resource(struct panfrost_context *panfrost,
-                                     struct pipe_resource *prsc);
+panfrost_batch_set_requirements(struct panfrost_batch *batch);
 
-void
-panfrost_flush_jobs_reading_resource(struct panfrost_context *panfrost,
-                                     struct pipe_resource *prsc);
+mali_ptr
+panfrost_batch_get_polygon_list(struct panfrost_batch *batch, unsigned size);
 
-void
-panfrost_job_submit(struct panfrost_context *ctx, struct panfrost_job *job);
+struct panfrost_bo *
+panfrost_batch_get_scratchpad(struct panfrost_batch *batch);
+
+struct panfrost_bo *
+panfrost_batch_get_tiler_heap(struct panfrost_batch *batch);
+
+struct panfrost_bo *
+panfrost_batch_get_tiler_dummy(struct panfrost_batch *batch);
 
 void
-panfrost_job_set_requirements(struct panfrost_context *ctx,
-                              struct panfrost_job *job);
+panfrost_batch_clear(struct panfrost_batch *batch,
+                     unsigned buffers,
+                     const union pipe_color_union *color,
+                     double depth, unsigned stencil);
 
 void
-panfrost_job_clear(struct panfrost_context *ctx,
-                   struct panfrost_job *job,
-                   unsigned buffers,
-                   const union pipe_color_union *color,
-                   double depth, unsigned stencil);
+panfrost_batch_union_scissor(struct panfrost_batch *batch,
+                             unsigned minx, unsigned miny,
+                             unsigned maxx, unsigned maxy);
 
 void
-panfrost_job_union_scissor(struct panfrost_job *job,
-                           unsigned minx, unsigned miny,
-                           unsigned maxx, unsigned maxy);
+panfrost_batch_intersection_scissor(struct panfrost_batch *batch,
+                                    unsigned minx, unsigned miny,
+                                    unsigned maxx, unsigned maxy);
 
 /* Scoreboarding */
 
 void
 panfrost_scoreboard_queue_compute_job(
-        struct panfrost_job *batch,
+        struct panfrost_batch *batch,
         struct panfrost_transfer job);
 
 void
 panfrost_scoreboard_queue_vertex_job(
-        struct panfrost_job *batch,
+        struct panfrost_batch *batch,
         struct panfrost_transfer vertex,
         bool requires_tiling);
 
 void
 panfrost_scoreboard_queue_tiler_job(
-        struct panfrost_job *batch,
+        struct panfrost_batch *batch,
         struct panfrost_transfer tiler);
 
 void
 panfrost_scoreboard_queue_fused_job(
-        struct panfrost_job *batch,
+        struct panfrost_batch *batch,
         struct panfrost_transfer vertex,
         struct panfrost_transfer tiler);
 void
 panfrost_scoreboard_queue_fused_job_prepend(
-        struct panfrost_job *batch,
+        struct panfrost_batch *batch,
         struct panfrost_transfer vertex,
         struct panfrost_transfer tiler);
 
 void
-panfrost_scoreboard_link_batch(struct panfrost_job *batch);
+panfrost_scoreboard_link_batch(struct panfrost_batch *batch);
+
+bool
+panfrost_batch_is_scanout(struct panfrost_batch *batch);
 
 #endif