i965: Re-enable fast color clears for GEN11.

[mesa.git] / src / mesa / drivers / dri / i915 / intel_batchbuffer.h

diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h
index ede177312fee1c2c80199f7338a0b7bb81bbb7d7..9ebc61f1c2937c28c2646923a0817b10ff77f584 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h
@@ -7,10 +7,6 @@
 #include "intel_bufmgr.h"
 #include "intel_reg.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Number of bytes to reserve for commands necessary to complete a batch.
  *
@@ -54,7 +50,7 @@ bool intel_batchbuffer_emit_reloc_fenced(struct intel_context *intel,
                                              uint32_t offset);
 void intel_batchbuffer_emit_mi_flush(struct intel_context *intel);
 
-static INLINE uint32_t float_as_int(float f)
+static inline uint32_t float_as_int(float f)
 {
    union {
       float f;
@@ -70,7 +66,7 @@ static INLINE uint32_t float_as_int(float f)
  * be passed as structs rather than dwords, but that's a little bit of
  * work...
  */
-static INLINE unsigned
+static inline unsigned
 intel_batchbuffer_space(struct intel_context *intel)
 {
    return (intel->batch.bo->size - intel->batch.reserved_space)
@@ -78,7 +74,7 @@ intel_batchbuffer_space(struct intel_context *intel)
 }
 
 
-static INLINE void
+static inline void
 intel_batchbuffer_emit_dword(struct intel_context *intel, GLuint dword)
 {
 #ifdef DEBUG
@@ -87,13 +83,13 @@ intel_batchbuffer_emit_dword(struct intel_context *intel, GLuint dword)
    intel->batch.map[intel->batch.used++] = dword;
 }
 
-static INLINE void
+static inline void
 intel_batchbuffer_emit_float(struct intel_context *intel, float f)
 {
    intel_batchbuffer_emit_dword(intel, float_as_int(f));
 }
 
-static INLINE void
+static inline void
 intel_batchbuffer_require_space(struct intel_context *intel,
                                 GLuint sz)
 {
@@ -104,7 +100,7 @@ intel_batchbuffer_require_space(struct intel_context *intel,
       intel_batchbuffer_flush(intel);
 }
 
-static INLINE void
+static inline void
 intel_batchbuffer_begin(struct intel_context *intel, int n)
 {
    intel_batchbuffer_require_space(intel, n * 4);
@@ -115,7 +111,7 @@ intel_batchbuffer_begin(struct intel_context *intel, int n)
 #endif
 }
 
-static INLINE void
+static inline void
 intel_batchbuffer_advance(struct intel_context *intel)
 {
 #ifdef DEBUG
@@ -128,6 +124,8 @@ intel_batchbuffer_advance(struct intel_context *intel)
       abort();
    }
    batch->total = 0;
+#else
+   (void) intel;
 #endif
 }
 
@@ -150,8 +148,4 @@ intel_batchbuffer_advance(struct intel_context *intel)
 #define ADVANCE_BATCH() intel_batchbuffer_advance(intel);
 #define CACHED_BATCH() intel_batchbuffer_cached_advance(intel);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif