Merge Mesa 21.3.7

1 files changed, 13 insertions, 12 deletions

diff --git a/lib/mesa/src/gallium/drivers/freedreno/freedreno_batch.h b/lib/mesa/src/gallium/drivers/freedreno/freedreno_batch.h
index 42cbf6c8d..7b554c3cc 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/freedreno_batch.h
+++ b/lib/mesa/src/gallium/drivers/freedreno/freedreno_batch.h
@@ -31,16 +31,14 @@
 #include "util/simple_mtx.h"
 #include "util/u_inlines.h"
 #include "util/u_queue.h"
-#include "util/u_trace.h"
+#include "util/perf/u_trace.h"
 
 #include "freedreno_context.h"
 #include "freedreno_fence.h"
 #include "freedreno_util.h"
 
-#ifdef DEBUG
-#define BATCH_DEBUG FD_DBG(MSGS)
-#else
-#define BATCH_DEBUG 0
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 struct fd_resource;
@@ -62,7 +60,6 @@ struct fd_batch {
    uint32_t *last_timestamp_cmd;
 
    int in_fence_fd;
-   bool needs_out_fence_fd;
    struct pipe_fence_handle *fence;
 
    struct fd_context *ctx;
@@ -97,8 +94,6 @@ struct fd_batch {
    bool nondraw : 1;
    bool needs_flush : 1;
    bool flushed : 1;
-   bool blit : 1;
-   bool back_blit : 1;    /* only blit so far is resource shadowing back-blit */
    bool tessellation : 1; /* tessellation used in batch */
 
    /* Keep track if WAIT_FOR_IDLE is needed for registers we need
@@ -255,7 +250,7 @@ struct fd_batch {
    struct set *resources;
 
    /** key in batch-cache (if not null): */
-   const struct fd_batch_key *key;
+   struct fd_batch_key *key;
    uint32_t hash;
 
    /** set of dependent batches.. holds refs to dependent batches: */
@@ -348,7 +343,7 @@ fd_batch_unlock_submit(struct fd_batch *batch)
 }
 
 /**
- * Returns true if emit-lock was aquired, false if failed to aquire lock,
+ * Returns true if emit-lock was acquired, false if failed to acquire lock,
  * ie. batch already flushed.
  */
 static inline bool MUST_CHECK
@@ -417,12 +412,18 @@ fd_event_write(struct fd_batch *batch, struct fd_ringbuffer *ring,
 static inline struct fd_ringbuffer *
 fd_batch_get_epilogue(struct fd_batch *batch)
 {
-   if (batch->epilogue == NULL)
-      batch->epilogue = fd_submit_new_ringbuffer(batch->submit, 0x1000, 0);
+   if (batch->epilogue == NULL) {
+      batch->epilogue = fd_submit_new_ringbuffer(batch->submit, 0x1000,
+                                                 (enum fd_ringbuffer_flags)0);
+   }
 
    return batch->epilogue;
 }
 
 struct fd_ringbuffer *fd_batch_get_prologue(struct fd_batch *batch);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREEDRENO_BATCH_H_ */