diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2013-12-02 13:39:40 -0800 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-12-05 13:59:18 -0800 |
commit | 26f3ff8a916d7315b2d6d23ee9e52d946b68a136 (patch) | |
tree | 12748260a5db6bab0f6707be1b49522732ad8b64 /src/mesa/drivers/dri/i965/intel_batchbuffer.h | |
parent | 11d9af7c0ab76c551e676c5ce0f0f369d7fc9f97 (diff) | |
download | external_mesa3d-26f3ff8a916d7315b2d6d23ee9e52d946b68a136.zip external_mesa3d-26f3ff8a916d7315b2d6d23ee9e52d946b68a136.tar.gz external_mesa3d-26f3ff8a916d7315b2d6d23ee9e52d946b68a136.tar.bz2 |
i965: Replace non-standard INLINE macro with "inline".
These are identical: main/compiler.h defines INLINE to "inline".
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_batchbuffer.h')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/intel_batchbuffer.h index ac8eb7d..02120bb 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.h @@ -70,7 +70,7 @@ void intel_emit_depth_stall_flushes(struct brw_context *brw); void gen7_emit_vs_workaround_flush(struct brw_context *brw); void gen7_emit_cs_stall_flush(struct brw_context *brw); -static INLINE uint32_t float_as_int(float f) +static inline uint32_t float_as_int(float f) { union { float f; @@ -86,7 +86,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 brw_context *brw) { return (brw->batch.state_batch_offset - brw->batch.reserved_space) @@ -94,7 +94,7 @@ intel_batchbuffer_space(struct brw_context *brw) } -static INLINE void +static inline void intel_batchbuffer_emit_dword(struct brw_context *brw, GLuint dword) { #ifdef DEBUG @@ -104,13 +104,13 @@ intel_batchbuffer_emit_dword(struct brw_context *brw, GLuint dword) assert(brw->batch.ring != UNKNOWN_RING); } -static INLINE void +static inline void intel_batchbuffer_emit_float(struct brw_context *brw, float f) { intel_batchbuffer_emit_dword(brw, float_as_int(f)); } -static INLINE void +static inline void intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz, enum brw_gpu_ring ring) { @@ -136,7 +136,7 @@ intel_batchbuffer_require_space(struct brw_context *brw, GLuint sz, intel_batchbuffer_emit_render_ring_prelude(brw); } -static INLINE void +static inline void intel_batchbuffer_begin(struct brw_context *brw, int n, enum brw_gpu_ring ring) { intel_batchbuffer_require_space(brw, n * 4, ring); @@ -147,7 +147,7 @@ intel_batchbuffer_begin(struct brw_context *brw, int n, enum brw_gpu_ring ring) #endif } -static INLINE void +static inline void intel_batchbuffer_advance(struct brw_context *brw) { #ifdef DEBUG |