From f51f2af76d5532a4f272f15ac28e1a23a4967fd0 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2015 09:48:44 -0700 Subject: [PATCH] radeon: replace INLINE with inline Reviewed-by: Alex Deucher --- src/mesa/drivers/dri/radeon/radeon_cmdbuf.h | 2 +- src/mesa/drivers/dri/radeon/radeon_common.c | 4 ++-- src/mesa/drivers/dri/radeon/radeon_common_context.h | 6 +++--- src/mesa/drivers/dri/radeon/radeon_ioctl.h | 2 +- src/mesa/drivers/dri/radeon/radeon_swtcl.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h index 31b95fd661a..5f454cbd001 100644 --- a/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h +++ b/src/mesa/drivers/dri/radeon/radeon_cmdbuf.h @@ -98,7 +98,7 @@ void rcommonBeginBatch(radeonContextPtr rmesa, /* Fire the buffered vertices no matter what. */ -static INLINE void radeon_firevertices(radeonContextPtr radeon) +static inline void radeon_firevertices(radeonContextPtr radeon) { if (radeon->cmdbuf.cs->cdw || radeon->dma.flush ) radeon->glCtx.Driver.Flush(&radeon->glCtx); /* +r6/r7 */ diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 966e10a0460..3bcc7f2c088 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -486,7 +486,7 @@ out: return dwords; } -static INLINE void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state_atom *atom) +static inline void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state_atom *atom) { BATCH_LOCALS(radeon); int dwords; @@ -511,7 +511,7 @@ static INLINE void radeon_emit_atom(radeonContextPtr radeon, struct radeon_state } -static INLINE void radeonEmitAtoms(radeonContextPtr radeon, GLboolean emitAll) +static inline void radeonEmitAtoms(radeonContextPtr radeon, GLboolean emitAll) { struct radeon_state_atom *atom; diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h index cfed40860ef..8a1c61ad80b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h @@ -171,7 +171,7 @@ struct _radeon_texture_image { }; -static INLINE radeon_texture_image *get_radeon_texture_image(struct gl_texture_image *image) +static inline radeon_texture_image *get_radeon_texture_image(struct gl_texture_image *image) { return (radeon_texture_image*)image; } @@ -213,7 +213,7 @@ struct radeon_tex_obj { GLboolean border_fallback; }; -static INLINE radeonTexObj* radeon_tex_obj(struct gl_texture_object *texObj) +static inline radeonTexObj* radeon_tex_obj(struct gl_texture_object *texObj) { return (radeonTexObj*)texObj; } @@ -316,7 +316,7 @@ struct radeon_prim { GLuint prim; }; -static INLINE GLuint radeonPackColor(GLuint cpp, +static inline GLuint radeonPackColor(GLuint cpp, GLubyte r, GLubyte g, GLubyte b, GLubyte a) { diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h index 849beb9867d..4d24e5f6a26 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h @@ -110,7 +110,7 @@ do { \ memcpy( rmesa->hw.ATOM.lastcmd, rmesa->hw.ATOM.cmd, \ rmesa->hw.ATOM.cmd_size * 4) -static INLINE int RADEON_DB_STATECHANGE(r100ContextPtr rmesa, +static inline int RADEON_DB_STATECHANGE(r100ContextPtr rmesa, struct radeon_state_atom *atom ) { if (memcmp(atom->cmd, atom->lastcmd, atom->cmd_size*4)) { diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c index 5a6cede4b1a..984879705ff 100644 --- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c @@ -374,7 +374,7 @@ static const GLuint hw_prim[GL_POLYGON+1] = { 0 }; -static INLINE void +static inline void radeonDmaPrimitive( r100ContextPtr rmesa, GLenum prim ) { RADEON_NEWPRIM( rmesa );