Mesa (master): i965: Replace non-standard INLINE macro with "inline".
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Dec 5 21:58:21 UTC 2013
Module: Mesa
Branch: master
Commit: 26f3ff8a916d7315b2d6d23ee9e52d946b68a136
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26f3ff8a916d7315b2d6d23ee9e52d946b68a136
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Dec 2 13:39:40 2013 -0800
i965: Replace non-standard INLINE macro with "inline".
These are identical: main/compiler.h defines INLINE to "inline".
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_context.h | 16 ++++++++--------
src/mesa/drivers/dri/i965/brw_eu.h | 2 +-
src/mesa/drivers/dri/i965/intel_batchbuffer.h | 14 +++++++-------
src/mesa/drivers/dri/i965/intel_fbo.h | 6 +++---
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 2 +-
src/mesa/drivers/dri/i965/intel_tex_obj.h | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 9f5fea3..784cfbe 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1493,7 +1493,7 @@ struct brw_context
struct intel_screen *intelScreen;
};
-static INLINE bool
+static inline bool
is_power_of_two(uint32_t value)
{
return (value & (value - 1)) == 0;
@@ -1749,37 +1749,37 @@ brw_get_graphics_reset_status(struct gl_context *ctx);
* Inline conversion functions. These are better-typed than the
* macros used previously:
*/
-static INLINE struct brw_context *
+static inline struct brw_context *
brw_context( struct gl_context *ctx )
{
return (struct brw_context *)ctx;
}
-static INLINE struct brw_vertex_program *
+static inline struct brw_vertex_program *
brw_vertex_program(struct gl_vertex_program *p)
{
return (struct brw_vertex_program *) p;
}
-static INLINE const struct brw_vertex_program *
+static inline const struct brw_vertex_program *
brw_vertex_program_const(const struct gl_vertex_program *p)
{
return (const struct brw_vertex_program *) p;
}
-static INLINE struct brw_geometry_program *
+static inline struct brw_geometry_program *
brw_geometry_program(struct gl_geometry_program *p)
{
return (struct brw_geometry_program *) p;
}
-static INLINE struct brw_fragment_program *
+static inline struct brw_fragment_program *
brw_fragment_program(struct gl_fragment_program *p)
{
return (struct brw_fragment_program *) p;
}
-static INLINE const struct brw_fragment_program *
+static inline const struct brw_fragment_program *
brw_fragment_program_const(const struct gl_fragment_program *p)
{
return (const struct brw_fragment_program *) p;
@@ -1873,7 +1873,7 @@ gen6_upload_vec4_push_constants(struct brw_context *brw,
* 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__(
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index 060c7d0..44eabe0 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -90,7 +90,7 @@ struct brw_compile {
int loop_stack_array_size;
};
-static INLINE struct brw_instruction *current_insn( struct brw_compile *p)
+static inline struct brw_instruction *current_insn( struct brw_compile *p)
{
return &p->store[p->nr_insn];
}
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
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/intel_fbo.h
index b8072fb..02c357d 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.h
+++ b/src/mesa/drivers/dri/i965/intel_fbo.h
@@ -84,7 +84,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;
@@ -105,7 +105,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;
@@ -120,7 +120,7 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex)
}
-static INLINE gl_format
+static inline gl_format
intel_rb_format(const struct intel_renderbuffer *rb)
{
return rb->Base.Base.Format;
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
index f45b4a8..6858c7d 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/i965/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/i965/intel_tex_obj.h b/src/mesa/drivers/dri/i965/intel_tex_obj.h
index c0c1368..b949912 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_obj.h
+++ b/src/mesa/drivers/dri/i965/intel_tex_obj.h
@@ -72,13 +72,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;
More information about the mesa-commit
mailing list