radeon: replace INLINE with inline
authorBrian Paul <brianp@vmware.com>
Thu, 26 Feb 2015 16:48:44 +0000 (09:48 -0700)
committerBrian Paul <brianp@vmware.com>
Thu, 26 Feb 2015 18:02:14 +0000 (11:02 -0700)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_common_context.h
src/mesa/drivers/dri/radeon/radeon_ioctl.h
src/mesa/drivers/dri/radeon/radeon_swtcl.c

index 31b95fd661af68d7deb69813cca5dc297eeca9c1..5f454cbd0017b15b2df141989f4b4e6896615f9f 100644 (file)
@@ -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 */
index 966e10a046074678d6bac308092130e798e77ca3..3bcc7f2c0884601f5db28e682b7bcaca864e9c47 100644 (file)
@@ -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;
 
index cfed40860ef37b59685ccae3a05fab7a61d2875b..8a1c61ad80b19abdc31140656674dd45b3d6bb72 100644 (file)
@@ -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)
 {
index 849beb9867ddabc96f259621e1223b71f7d10303..4d24e5f6a2625641162ce94189032eb58a4761b4 100644 (file)
@@ -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)) {
index 5a6cede4b1a9a3f881fc8731ce87ed8dff336292..984879705ffcc5918c120045096fad9e7084c5e8 100644 (file)
@@ -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 );