From 8e9fe53ce9f8b01ae66b19dc273594fa413e9ad5 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2015 09:48:24 -0700 Subject: [PATCH] i915: replace INLINE with inline Reviewed-by: Alex Deucher --- src/mesa/drivers/dri/i915/i830_context.h | 2 +- src/mesa/drivers/dri/i915/i830_texblend.c | 2 +- src/mesa/drivers/dri/i915/i915_context.h | 2 +- src/mesa/drivers/dri/i915/i915_program.h | 4 ++-- src/mesa/drivers/dri/i915/intel_batchbuffer.h | 14 +++++++------- src/mesa/drivers/dri/i915/intel_context.h | 4 ++-- src/mesa/drivers/dri/i915/intel_fbo.h | 6 +++--- src/mesa/drivers/dri/i915/intel_pixel_bitmap.c | 2 +- src/mesa/drivers/dri/i915/intel_render.c | 4 ++-- src/mesa/drivers/dri/i915/intel_tex_obj.h | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mesa/drivers/dri/i915/i830_context.h b/src/mesa/drivers/dri/i915/i830_context.h index 09076c3b53b..140f617e007 100644 --- a/src/mesa/drivers/dri/i915/i830_context.h +++ b/src/mesa/drivers/dri/i915/i830_context.h @@ -216,7 +216,7 @@ extern void i830_update_provoking_vertex(struct gl_context *ctx); * Inline conversion functions. These are better-typed than the * macros used previously: */ -static INLINE struct i830_context * +static inline struct i830_context * i830_context(struct gl_context * ctx) { return (struct i830_context *) ctx; diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index d5cbb376752..ebfce7fe4fc 100644 --- a/src/mesa/drivers/dri/i915/i830_texblend.c +++ b/src/mesa/drivers/dri/i915/i830_texblend.c @@ -93,7 +93,7 @@ emit_factor(GLuint blendUnit, GLuint * state, GLuint count, } -static INLINE GLuint +static inline GLuint GetTexelOp(GLint unit) { switch (unit) { diff --git a/src/mesa/drivers/dri/i915/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h index 10f1f8bea7f..fa58ecb8165 100644 --- a/src/mesa/drivers/dri/i915/i915_context.h +++ b/src/mesa/drivers/dri/i915/i915_context.h @@ -361,7 +361,7 @@ extern void i915InitFragProgFuncs(struct dd_function_table *functions); * Inline conversion functions. These are better-typed than the * macros used previously: */ -static INLINE struct i915_context * +static inline struct i915_context * i915_context(struct gl_context * ctx) { return (struct i915_context *) ctx; diff --git a/src/mesa/drivers/dri/i915/i915_program.h b/src/mesa/drivers/dri/i915/i915_program.h index cd36e770c77..bcc63089304 100644 --- a/src/mesa/drivers/dri/i915/i915_program.h +++ b/src/mesa/drivers/dri/i915/i915_program.h @@ -84,7 +84,7 @@ /* One neat thing about the UREG representation: */ -static INLINE int +static inline int swizzle(int reg, int x, int y, int z, int w) { return ((reg & ~UREG_XYZW_CHANNEL_MASK) | @@ -96,7 +96,7 @@ swizzle(int reg, int x, int y, int z, int w) /* Another neat thing about the UREG representation: */ -static INLINE int +static inline int negate(int reg, int x, int y, int z, int w) { return reg ^ (((x & 1) << UREG_CHANNEL_X_NEGATE_SHIFT) | diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h index ede177312fe..feecc01394c 100644 --- a/src/mesa/drivers/dri/i915/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h @@ -54,7 +54,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 +70,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 +78,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 +87,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 +104,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 +115,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 diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index f0773c8b668..a2819a17ce1 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -302,7 +302,7 @@ do { \ * XXX Put this in src/mesa/main/imports.h ??? */ #if defined(i386) || defined(__i386__) -static INLINE void * __memcpy(void * to, const void * from, size_t n) +static inline void * __memcpy(void * to, const void * from, size_t n) { int d0, d1, d2; __asm__ __volatile__( @@ -499,7 +499,7 @@ void intel_init_texture_formats(struct gl_context *ctx); * Inline conversion functions. * These are better-typed than the macros used previously: */ -static INLINE struct intel_context * +static inline struct intel_context * intel_context(struct gl_context * ctx) { return (struct intel_context *) ctx; diff --git a/src/mesa/drivers/dri/i915/intel_fbo.h b/src/mesa/drivers/dri/i915/intel_fbo.h index 25a29d81eaf..114dd68b596 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.h +++ b/src/mesa/drivers/dri/i915/intel_fbo.h @@ -85,7 +85,7 @@ struct intel_renderbuffer * NULL will be returned if the rb isn't really an intel_renderbuffer. * This is determined by checking the ClassID. */ -static INLINE struct intel_renderbuffer * +static inline struct intel_renderbuffer * intel_renderbuffer(struct gl_renderbuffer *rb) { struct intel_renderbuffer *irb = (struct intel_renderbuffer *) rb; @@ -106,7 +106,7 @@ intel_renderbuffer(struct gl_renderbuffer *rb) * If the attached renderbuffer is a wrapper, then return wrapped * renderbuffer. */ -static INLINE struct intel_renderbuffer * +static inline struct intel_renderbuffer * intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex) { struct gl_renderbuffer *rb; @@ -121,7 +121,7 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex) } -static INLINE mesa_format +static inline mesa_format intel_rb_format(const struct intel_renderbuffer *rb) { return rb->Base.Base.Format; diff --git a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c index ce8ea4c07b3..70cf413c265 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c @@ -158,7 +158,7 @@ static GLuint get_bitmap_rect(GLsizei width, GLsizei height, * Returns the low Y value of the vertical range given, flipped according to * whether the framebuffer is or not. */ -static INLINE int +static inline int y_flip(struct gl_framebuffer *fb, int y, int height) { if (_mesa_is_user_fbo(fb)) diff --git a/src/mesa/drivers/dri/i915/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c index 5e11315dd36..bf48f384ede 100644 --- a/src/mesa/drivers/dri/i915/intel_render.c +++ b/src/mesa/drivers/dri/i915/intel_render.c @@ -121,7 +121,7 @@ intelDmaPrimitive(struct intel_context *intel, GLenum prim) #define INTEL_NO_VBO_STATE_RESERVED 1500 -static INLINE GLuint intel_get_vb_max(struct intel_context *intel) +static inline GLuint intel_get_vb_max(struct intel_context *intel) { GLuint ret; @@ -133,7 +133,7 @@ static INLINE GLuint intel_get_vb_max(struct intel_context *intel) return ret; } -static INLINE GLuint intel_get_current_max(struct intel_context *intel) +static inline GLuint intel_get_current_max(struct intel_context *intel) { GLuint ret; diff --git a/src/mesa/drivers/dri/i915/intel_tex_obj.h b/src/mesa/drivers/dri/i915/intel_tex_obj.h index 0e40bcb5870..727e8eacd01 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_obj.h +++ b/src/mesa/drivers/dri/i915/intel_tex_obj.h @@ -69,13 +69,13 @@ struct intel_texture_image struct intel_mipmap_tree *mt; }; -static INLINE struct intel_texture_object * +static inline struct intel_texture_object * intel_texture_object(struct gl_texture_object *obj) { return (struct intel_texture_object *) obj; } -static INLINE struct intel_texture_image * +static inline struct intel_texture_image * intel_texture_image(struct gl_texture_image *img) { return (struct intel_texture_image *) img; -- 2.30.2