mesa: Add missing include guards

[mesa.git] / src / mesa / main / glthread.h

diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 36692fe57043209a19f1c123b481aa10ff658270..8cd5d0226743d92dacf35600f83a78ee62e9920e 100644 (file)
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -24,10 +24,16 @@
 #ifndef _GLTHREAD_H
 #define _GLTHREAD_H
 
-#include "main/mtypes.h"
-
-/* Command size is a number of bytes stored in a short. */
-#define MARSHAL_MAX_CMD_SIZE 65535
+/* The size of one batch and the maximum size of one call.
+ *
+ * This should be as low as possible, so that:
+ * - multiple synchronizations within a frame don't slow us down much
+ * - a smaller number of calls per frame can still get decent parallelism
+ * - the memory footprint of the queue is low, and with that comes a lower
+ *   chance of experiencing CPU cache thrashing
+ * but it should be high enough so that u_queue overhead remains negligible.
+ */
+#define MARSHAL_MAX_CMD_SIZE (8 * 1024)
 
 /* The number of batch slots in memory.
  *
@@ -35,14 +41,14 @@
  * waiting batches. There must be at least 1 slot for a waiting batch,
  * so the minimum number of batches is 3.
  */
-#define MARSHAL_MAX_BATCHES 4
+#define MARSHAL_MAX_BATCHES 8
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include <pthread.h>
 #include "util/u_queue.h"
 
 enum marshal_dispatch_cmd_id;
+struct gl_context;
 
 /** A single batch of commands queued up for execution. */
 struct glthread_batch