[Mesa-dev] [PATCH 5/5] mesa: s/INLINE/inline/
Brian Paul
brian.e.paul at gmail.com
Fri Sep 30 20:14:41 PDT 2011
From: Brian Paul <brianp at vmware.com>
INLINE is still seen in some files (some generated files, etc) but this
is a good start.
---
src/mesa/main/accum.h | 4 +-
src/mesa/main/api_arrayelt.h | 8 ++--
src/mesa/main/api_loopback.h | 2 +-
src/mesa/main/arrayobj.c | 2 +-
src/mesa/main/atifragshader.h | 6 +-
src/mesa/main/attrib.h | 6 +-
src/mesa/main/bitset.h | 2 +-
src/mesa/main/bufferobj.c | 4 +-
src/mesa/main/bufferobj.h | 6 +-
src/mesa/main/colortab.h | 6 +-
src/mesa/main/convolve.h | 2 +-
src/mesa/main/dlist.c | 8 ++--
src/mesa/main/dlist.h | 6 +-
src/mesa/main/drawpix.h | 2 +-
src/mesa/main/eval.h | 4 +-
src/mesa/main/fbobject.c | 6 +-
src/mesa/main/fbobject.h | 4 +-
src/mesa/main/feedback.c | 2 +-
src/mesa/main/feedback.h | 10 ++--
src/mesa/main/format_unpack.c | 2 +-
src/mesa/main/framebuffer.h | 2 +-
src/mesa/main/hash.c | 2 +-
src/mesa/main/histogram.h | 2 +-
src/mesa/main/image.c | 4 +-
src/mesa/main/imports.h | 48 +++++++++---------
src/mesa/main/mm.c | 2 +-
src/mesa/main/mtypes.h | 4 +-
src/mesa/main/pack.c | 10 ++--
src/mesa/main/pixel.h | 4 +-
src/mesa/main/queryobj.h | 8 ++--
src/mesa/main/rastpos.h | 2 +-
src/mesa/main/remap.h | 10 ++--
src/mesa/main/renderbuffer.h | 2 +-
src/mesa/main/samplerobj.c | 2 +-
src/mesa/main/samplerobj.h | 2 +-
src/mesa/main/shaderobj.h | 4 +-
src/mesa/main/state.h | 2 +-
src/mesa/main/syncobj.h | 12 ++--
src/mesa/main/texcompress_s3tc.c | 2 +-
src/mesa/main/texcompress_s3tc.h | 2 +-
src/mesa/main/texgen.h | 4 +-
src/mesa/main/texgetimage.c | 2 +-
src/mesa/main/teximage.c | 2 +-
src/mesa/main/teximage.h | 4 +-
src/mesa/main/texobj.h | 2 +-
src/mesa/main/texparam.c | 4 +-
src/mesa/main/texstate.h | 2 +-
src/mesa/main/transformfeedback.h | 8 ++--
src/mesa/main/varray.h | 2 +-
src/mesa/main/vtxfmt.h | 4 +-
src/mesa/program/prog_execute.c | 14 +++---
src/mesa/program/prog_parameter.h | 2 +-
src/mesa/program/program.h | 18 +++---
src/mesa/swrast/s_aaline.c | 10 ++--
src/mesa/swrast/s_aatriangle.c | 14 +++---
src/mesa/swrast/s_blit.c | 2 +-
src/mesa/swrast/s_context.h | 12 ++--
src/mesa/swrast/s_fragprog.c | 2 +-
src/mesa/swrast/s_logic.c | 6 +-
src/mesa/swrast/s_points.c | 2 +-
src/mesa/swrast/s_span.c | 22 ++++----
src/mesa/swrast/s_stencil.c | 2 +-
src/mesa/swrast/s_texcombine.c | 2 +-
src/mesa/swrast/s_texfetch.c | 2 +-
src/mesa/swrast/s_texfilter.c | 52 ++++++++++----------
src/mesa/swrast/s_triangle.c | 8 ++--
src/mesa/swrast/s_zoom.c | 2 +-
src/mesa/tnl/t_vb_program.c | 2 +-
src/mesa/tnl/t_vertex_generic.c | 98 ++++++++++++++++++------------------
src/mesa/vbo/vbo_attrib_tmp.h | 12 ++--
src/mesa/vbo/vbo_context.h | 4 +-
src/mesa/vbo/vbo_exec.h | 4 +-
src/mesa/vbo/vbo_save.h | 4 +-
73 files changed, 274 insertions(+), 274 deletions(-)
diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 9344244..f16378c 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -55,14 +55,14 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp);
#include "main/compiler.h"
-static INLINE void
+static inline void
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
/* this is used in _mesa_PopAttrib */
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_init_accum_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index b90d713..03810c6 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -56,23 +56,23 @@ _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)
-static INLINE GLboolean
+static inline GLboolean
_ae_create_context( struct gl_context *ctx )
{
return GL_TRUE;
}
-static INLINE void
+static inline void
_ae_destroy_context( struct gl_context *ctx )
{
}
-static INLINE void
+static inline void
_ae_invalidate_state( struct gl_context *ctx, GLuint new_state )
{
}
-static INLINE void
+static inline void
_mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
const GLvertexformat *vfmt)
{
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index b9af703..f53b902 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -38,7 +38,7 @@ extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
#else /* FEATURE_beginend */
-static INLINE void
+static inline void
_mesa_loopback_init_api_table( struct _glapi_table *dest )
{
}
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 83a82e8..78f56ab 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -64,7 +64,7 @@
* non-existent.
*/
-static INLINE struct gl_array_object *
+static inline struct gl_array_object *
lookup_arrayobj(struct gl_context *ctx, GLuint id)
{
if (id == 0)
diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h
index ade9131..90ada21 100644
--- a/src/mesa/main/atifragshader.h
+++ b/src/mesa/main/atifragshader.h
@@ -132,18 +132,18 @@ _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
#else /* FEATURE_ATI_fragment_shader */
-static INLINE void
+static inline void
_mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
{
}
-static INLINE struct ati_fragment_shader *
+static inline struct ati_fragment_shader *
_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)
{
return NULL;
}
-static INLINE void
+static inline void
_mesa_delete_ati_fragment_shader(struct gl_context *ctx,
struct ati_fragment_shader *s)
{
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index d59d31b..6809311 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -52,19 +52,19 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp);
#else /* FEATURE_attrib_stack */
-static INLINE void
+static inline void
_mesa_PushClientAttrib( GLbitfield mask )
{
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_PopClientAttrib( void )
{
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_init_attrib_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
index 9f48b3c..7a0704b 100644
--- a/src/mesa/main/bitset.h
+++ b/src/mesa/main/bitset.h
@@ -81,7 +81,7 @@
/* Get first bit set in a bitset.
*/
-static INLINE int
+static inline int
__bitset_ffs(const BITSET_WORD *x, int n)
{
int i;
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 99edb1a..431eafd 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -70,7 +70,7 @@ static struct gl_buffer_object DummyBufferObject;
* \return pointer to pointer to the buffer object bound to \c target in the
* specified context or \c NULL if \c target is invalid.
*/
-static INLINE struct gl_buffer_object **
+static inline struct gl_buffer_object **
get_buffer_target(struct gl_context *ctx, GLenum target)
{
switch (target) {
@@ -112,7 +112,7 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
* \return pointer to the buffer object bound to \c target in the
* specified context or \c NULL if \c target is invalid.
*/
-static INLINE struct gl_buffer_object *
+static inline struct gl_buffer_object *
get_buffer(struct gl_context *ctx, GLenum target)
{
struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f82e414..b4e70f2 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -39,7 +39,7 @@
/** Is the given buffer object currently mapped? */
-static INLINE GLboolean
+static inline GLboolean
_mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
{
return obj->Pointer != NULL;
@@ -50,7 +50,7 @@ _mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
* Mesa uses default buffer objects in several places. Default buffers
* always have Name==0. User created buffers have Name!=0.
*/
-static INLINE GLboolean
+static inline GLboolean
_mesa_is_bufferobj(const struct gl_buffer_object *obj)
{
return obj->Name != 0;
@@ -79,7 +79,7 @@ _mesa_reference_buffer_object_(struct gl_context *ctx,
struct gl_buffer_object **ptr,
struct gl_buffer_object *bufObj);
-static INLINE void
+static inline void
_mesa_reference_buffer_object(struct gl_context *ctx,
struct gl_buffer_object **ptr,
struct gl_buffer_object *bufObj)
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index b0d2b5d..4e225ff 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -50,7 +50,7 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp);
#else /* FEATURE_colortable */
-static INLINE void GLAPIENTRY
+static inline void GLAPIENTRY
_mesa_ColorTable( GLenum target, GLenum internalformat,
GLsizei width, GLenum format, GLenum type,
const GLvoid *table )
@@ -58,7 +58,7 @@ _mesa_ColorTable( GLenum target, GLenum internalformat,
ASSERT_NO_FEATURE();
}
-static INLINE void GLAPIENTRY
+static inline void GLAPIENTRY
_mesa_ColorSubTable( GLenum target, GLsizei start,
GLsizei count, GLenum format, GLenum type,
const GLvoid *table )
@@ -66,7 +66,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_init_colortable_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 7dc0a48..9522856 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -41,7 +41,7 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp);
#else /* FEATURE_convolve */
-static INLINE void
+static inline void
_mesa_init_convolve_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f11dae9..343feec 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -560,7 +560,7 @@ make_list(GLuint name, GLuint count)
/**
* Lookup function to just encapsulate casting.
*/
-static INLINE struct gl_display_list *
+static inline struct gl_display_list *
lookup_list(struct gl_context *ctx, GLuint list)
{
return (struct gl_display_list *)
@@ -569,7 +569,7 @@ lookup_list(struct gl_context *ctx, GLuint list)
/** Is the given opcode an extension code? */
-static INLINE GLboolean
+static inline GLboolean
is_ext_opcode(OpCode opcode)
{
return (opcode >= OPCODE_EXT_0);
@@ -1043,7 +1043,7 @@ _mesa_dlist_alloc_opcode(struct gl_context *ctx,
* \param nparams number of function parameters
* \return pointer to start of instruction space
*/
-static INLINE Node *
+static inline Node *
alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams)
{
return dlist_alloc(ctx, opcode, nparams * sizeof(Node));
@@ -5672,7 +5672,7 @@ save_EdgeFlag(GLboolean x)
save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
}
-static INLINE GLboolean compare4fv( const GLfloat *a,
+static inline GLboolean compare4fv( const GLfloat *a,
const GLfloat *b,
GLuint count )
{
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 160ed62..8900843 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -76,20 +76,20 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
#define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
-static INLINE void
+static inline void
_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
{
/* there should be no list to delete */
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
const GLvertexformat *vfmt)
{
}
-static INLINE void
+static inline void
_mesa_init_dlist_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 31baa19..13efba5 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -39,7 +39,7 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp);
#else /* FEATURE_drawpix */
-static INLINE void
+static inline void
_mesa_init_drawpix_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index bfeeebd..5a42031 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -91,13 +91,13 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp);
#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0)
-static INLINE void
+static inline void
_mesa_install_eval_vtxfmt(struct _glapi_table *disp,
const GLvertexformat *vfmt)
{
}
-static INLINE void
+static inline void
_mesa_init_eval_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index fd371ab..139ff03 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -78,7 +78,7 @@ static struct gl_renderbuffer DummyRenderbuffer;
static struct gl_framebuffer IncompleteFramebuffer;
-static INLINE GLboolean
+static inline GLboolean
is_cube_face(GLenum target)
{
return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
@@ -89,7 +89,7 @@ is_cube_face(GLenum target)
/**
* Is the given FBO a user-created FBO?
*/
-static INLINE GLboolean
+static inline GLboolean
is_user_fbo(const struct gl_framebuffer *fb)
{
return fb->Name != 0;
@@ -99,7 +99,7 @@ is_user_fbo(const struct gl_framebuffer *fb)
/**
* Is the given FBO a window system FBO (like an X window)?
*/
-static INLINE GLboolean
+static inline GLboolean
is_winsys_fbo(const struct gl_framebuffer *fb)
{
return fb->Name == 0;
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 7eb2005..0a70a43 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -50,7 +50,7 @@ _mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
/** Return the texture image for a renderbuffer attachment */
-static INLINE struct gl_texture_image *
+static inline struct gl_texture_image *
_mesa_get_attachment_teximage(struct gl_renderbuffer_attachment *att)
{
assert(att->Type == GL_TEXTURE);
@@ -59,7 +59,7 @@ _mesa_get_attachment_teximage(struct gl_renderbuffer_attachment *att)
/** Return the (const) texture image for a renderbuffer attachment */
-static INLINE const struct gl_texture_image *
+static inline const struct gl_texture_image *
_mesa_get_attachment_teximage_const(const struct gl_renderbuffer_attachment *att)
{
assert(att->Type == GL_TEXTURE);
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index d73aa08..cb5f49f 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -197,7 +197,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
* Verifies there is free space in the buffer to write the value and
* increments the pointer.
*/
-static INLINE void
+static inline void
write_record(struct gl_context *ctx, GLuint value)
{
if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 0039a0b..6d256ee 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -40,7 +40,7 @@ _mesa_feedback_vertex( struct gl_context *ctx,
const GLfloat texcoord[4] );
-static INLINE void
+static inline void
_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
{
if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
@@ -61,7 +61,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp);
#include "main/compiler.h"
-static INLINE void
+static inline void
_mesa_feedback_vertex( struct gl_context *ctx,
const GLfloat win[4],
const GLfloat color[4],
@@ -72,21 +72,21 @@ _mesa_feedback_vertex( struct gl_context *ctx,
}
-static INLINE void
+static inline void
_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
{
/* render mode is always GL_RENDER */
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
{
/* render mode is always GL_RENDER */
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_init_feedback_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index dadff05..2051f68 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -34,7 +34,7 @@
* linear RGB value in [0, 1].
* Implemented with a 256-entry lookup table.
*/
-static INLINE GLfloat
+static inline GLfloat
nonlinear_to_linear(GLubyte cs8)
{
static GLfloat table[256];
diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index b2b29a7..7aef3e0 100644
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -54,7 +54,7 @@ extern void
_mesa_reference_framebuffer_(struct gl_framebuffer **ptr,
struct gl_framebuffer *fb);
-static INLINE void
+static inline void
_mesa_reference_framebuffer(struct gl_framebuffer **ptr,
struct gl_framebuffer *fb)
{
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 72d924d..4b250ad 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -123,7 +123,7 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
* Lookup an entry in the hash table, without locking.
* \sa _mesa_HashLookup
*/
-static INLINE void *
+static inline void *
_mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
{
GLuint pos;
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 5773242..d97e74a 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -48,7 +48,7 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp);
#else /* FEATURE_histogram */
-static INLINE void
+static inline void
_mesa_init_histogram_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 15f7812..7d95dd6 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1756,7 +1756,7 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
/**
* Clip dst coords against Xmax (or Ymax).
*/
-static INLINE void
+static inline void
clip_right_or_top(GLint *srcX0, GLint *srcX1,
GLint *dstX0, GLint *dstX1,
GLint maxValue)
@@ -1789,7 +1789,7 @@ clip_right_or_top(GLint *srcX0, GLint *srcX1,
/**
* Clip dst coords against Xmin (or Ymin).
*/
-static INLINE void
+static inline void
clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
GLint *dstX0, GLint *dstX1,
GLint minValue)
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 70defdc..5fb5581 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -153,13 +153,13 @@ typedef union { GLfloat f; GLint i; } fi_type;
#endif
#if defined(_MSC_VER)
-static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
-static INLINE float exp2f(float x) { return powf(2.0f, x); }
-static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }
-static INLINE float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
-static INLINE float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
-static INLINE float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
-static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
+static inline float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
+static inline float exp2f(float x) { return powf(2.0f, x); }
+static inline float log2f(float x) { return logf(x) * 1.442695041f; }
+static inline float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
+static inline float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
+static inline float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
+static inline int isblank(int ch) { return ch == ' ' || ch == '\t'; }
#define strtoll(p, e, b) _strtoi64(p, e, b)
#endif
/*@}*/
@@ -172,7 +172,7 @@ static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
/* This is pretty fast, but not accurate enough (only 2 fractional bits).
* Based on code from http://www.stereopsis.com/log2.html
*/
-static INLINE GLfloat LOG2(GLfloat x)
+static inline GLfloat LOG2(GLfloat x)
{
const GLfloat y = x * x * x * x;
const GLuint ix = *((GLuint *) &y);
@@ -184,7 +184,7 @@ static INLINE GLfloat LOG2(GLfloat x)
/* Pretty fast, and accurate.
* Based on code from http://www.flipcode.com/totd/
*/
-static INLINE GLfloat LOG2(GLfloat val)
+static inline GLfloat LOG2(GLfloat val)
{
fi_type num;
GLint log_2;
@@ -208,7 +208,7 @@ static INLINE GLfloat LOG2(GLfloat val)
*** IS_INF_OR_NAN: test if float is infinite or NaN
***/
#ifdef USE_IEEE
-static INLINE int IS_INF_OR_NAN( float x )
+static inline int IS_INF_OR_NAN( float x )
{
fi_type tmp;
tmp.f = x;
@@ -231,7 +231,7 @@ static INLINE int IS_INF_OR_NAN( float x )
*** IS_NEGATIVE: test if float is negative
***/
#if defined(USE_IEEE)
-static INLINE int GET_FLOAT_BITS( float x )
+static inline int GET_FLOAT_BITS( float x )
{
fi_type fi;
fi.f = x;
@@ -289,7 +289,7 @@ static INLINE int GET_FLOAT_BITS( float x )
*** IROUND: return (as an integer) float rounded to nearest integer
***/
#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
-static INLINE int iround(float f)
+static inline int iround(float f)
{
int r;
__asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
@@ -297,7 +297,7 @@ static INLINE int iround(float f)
}
#define IROUND(x) iround(x)
#elif defined(USE_X86_ASM) && defined(_MSC_VER)
-static INLINE int iround(float f)
+static inline int iround(float f)
{
int r;
_asm {
@@ -344,7 +344,7 @@ long iround(float f);
* but uses some IEEE specific tricks for better speed.
* Contributed by Josh Vanderhoof
*/
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
{
int ai, bi;
double af, bf;
@@ -357,7 +357,7 @@ static INLINE int ifloor(float f)
}
#define IFLOOR(x) ifloor(x)
#elif defined(USE_IEEE)
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
{
int ai, bi;
double af, bf;
@@ -371,7 +371,7 @@ static INLINE int ifloor(float f)
}
#define IFLOOR(x) ifloor(x)
#else
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
{
int i = IROUND(f);
return (i > f) ? i - 1 : i;
@@ -391,7 +391,7 @@ static INLINE int ifloor(float f)
* but uses some IEEE specific tricks for better speed.
* Contributed by Josh Vanderhoof
*/
-static INLINE int iceil(float f)
+static inline int iceil(float f)
{
int ai, bi;
double af, bf;
@@ -404,7 +404,7 @@ static INLINE int iceil(float f)
}
#define ICEIL(x) iceil(x)
#elif defined(USE_IEEE)
-static INLINE int iceil(float f)
+static inline int iceil(float f)
{
int ai, bi;
double af, bf;
@@ -417,7 +417,7 @@ static INLINE int iceil(float f)
}
#define ICEIL(x) iceil(x)
#else
-static INLINE int iceil(float f)
+static inline int iceil(float f)
{
int i = IROUND(f);
return (i < f) ? i + 1 : i;
@@ -429,7 +429,7 @@ static INLINE int iceil(float f)
/**
* Is x a power of two?
*/
-static INLINE int
+static inline int
_mesa_is_pow_two(int x)
{
return !(x & (x - 1));
@@ -449,7 +449,7 @@ _mesa_is_pow_two(int x)
* results would be different depending on optimization
* level used for build.
*/
-static INLINE int32_t
+static inline int32_t
_mesa_next_pow_two_32(uint32_t x)
{
#if defined(__GNUC__) && \
@@ -468,7 +468,7 @@ _mesa_next_pow_two_32(uint32_t x)
#endif
}
-static INLINE int64_t
+static inline int64_t
_mesa_next_pow_two_64(uint64_t x)
{
#if defined(__GNUC__) && \
@@ -495,7 +495,7 @@ _mesa_next_pow_two_64(uint64_t x)
/*
* Returns the floor form of binary logarithm for a 32-bit integer.
*/
-static INLINE GLuint
+static inline GLuint
_mesa_logbase2(GLuint n)
{
#if defined(__GNUC__) && \
@@ -516,7 +516,7 @@ _mesa_logbase2(GLuint n)
/**
* Return 1 if this is a little endian machine, 0 if big endian.
*/
-static INLINE GLboolean
+static inline GLboolean
_mesa_little_endian(void)
{
const GLuint ui = 1; /* intentionally not static */
diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 25a0293..ab32123 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -211,7 +211,7 @@ mmFindBlock(struct mem_block *heap, unsigned start)
}
-static INLINE int
+static inline int
Join2Blocks(struct mem_block *p)
{
/* XXX there should be some assertions here */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 70f33ff..8c39717 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -330,7 +330,7 @@ typedef enum
* (VERT_RESULT_PSIZ, VERT_RESULT_BFC0, VERT_RESULT_BFC1, and
* VERT_RESULT_EDGE) are converted to a value of -1.
*/
-static INLINE int
+static inline int
_mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)
{
if (vert_result >= VERT_RESULT_CLIP_DIST0)
@@ -350,7 +350,7 @@ _mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)
* gl_frag_attrib values which have no corresponding gl_vert_result
* (FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC) are converted to a value of -1.
*/
-static INLINE int
+static inline int
_mesa_frag_attrib_to_vert_result(gl_frag_attrib frag_attrib)
{
if (frag_attrib <= FRAG_ATTRIB_TEX7)
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index 6d6ae59..62e352f 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -2910,35 +2910,35 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
}
-static INLINE GLuint
+static inline GLuint
clamp_byte_to_uint(GLbyte b)
{
return b < 0 ? 0 : b;
}
-static INLINE GLuint
+static inline GLuint
clamp_short_to_uint(GLshort s)
{
return s < 0 ? 0 : s;
}
-static INLINE GLuint
+static inline GLuint
clamp_int_to_uint(GLint i)
{
return i < 0 ? 0 : i;
}
-static INLINE GLuint
+static inline GLuint
clamp_float_to_uint(GLfloat f)
{
return f < 0.0F ? 0 : IROUND(f);
}
-static INLINE GLuint
+static inline GLuint
clamp_half_to_uint(GLhalfARB h)
{
GLfloat f = _mesa_half_to_float(h);
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 558b106..797b0d9 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -60,12 +60,12 @@ _mesa_PixelTransferf(GLenum pname, GLfloat param)
}
-static INLINE void
+static inline void
_mesa_update_pixel(struct gl_context *ctx, GLuint newstate)
{
}
-static INLINE void
+static inline void
_mesa_init_pixel_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index 16962e5..e7a133b 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -34,7 +34,7 @@
#if FEATURE_queryobj
-static INLINE struct gl_query_object *
+static inline struct gl_query_object *
_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
{
return (struct gl_query_object *)
@@ -50,18 +50,18 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp);
#else /* FEATURE_queryobj */
-static INLINE struct gl_query_object *
+static inline struct gl_query_object *
_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
{
return NULL;
}
-static INLINE void
+static inline void
_mesa_init_query_object_functions(struct dd_function_table *driver)
{
}
-static INLINE void
+static inline void
_mesa_init_queryobj_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index d113906..cdd94a6 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -45,7 +45,7 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp);
#else /* FEATURE_rastpos */
-static INLINE void
+static inline void
_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index 5fee300..fa31724 100644
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -64,30 +64,30 @@ _mesa_init_remap_table(void);
#else /* FEATURE_remap_table */
-static INLINE const char *
+static inline const char *
_mesa_get_function_spec(int func_index)
{
return NULL;
}
-static INLINE int
+static inline int
_mesa_map_function_spec(const char *spec)
{
return -1;
}
-static INLINE void
+static inline void
_mesa_map_function_array(const struct gl_function_remap *func_array)
{
}
-static INLINE void
+static inline void
_mesa_map_static_functions(void)
{
}
-static INLINE void
+static inline void
_mesa_init_remap_table(void)
{
}
diff --git a/src/mesa/main/renderbuffer.h b/src/mesa/main/renderbuffer.h
index f9329d5..de471cd 100644
--- a/src/mesa/main/renderbuffer.h
+++ b/src/mesa/main/renderbuffer.h
@@ -108,7 +108,7 @@ extern void
_mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr,
struct gl_renderbuffer *rb);
-static INLINE void
+static inline void
_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
struct gl_renderbuffer *rb)
{
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 3ee27fb..7cf0654 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -313,7 +313,7 @@ validate_texture_wrap_mode(struct gl_context *ctx, GLenum wrap)
/**
* This is called just prior to changing any sampler object state.
*/
-static INLINE void
+static inline void
flush(struct gl_context *ctx)
{
FLUSH_VERTICES(ctx, _NEW_TEXTURE);
diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index a839010..fe7d5a7 100644
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -28,7 +28,7 @@
struct dd_function_table;
-static INLINE struct gl_sampler_object *
+static inline struct gl_sampler_object *
_mesa_get_samplerobj(struct gl_context *ctx, GLuint unit)
{
if (ctx->Texture.Unit[unit].Sampler)
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index de7c998..941841d 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -98,7 +98,7 @@ extern void
_mesa_free_shader_state(struct gl_context *ctx);
-static INLINE gl_shader_type
+static inline gl_shader_type
_mesa_shader_type_to_index(GLenum v)
{
switch (v) {
@@ -115,7 +115,7 @@ _mesa_shader_type_to_index(GLenum v)
}
-static INLINE GLenum
+static inline GLenum
_mesa_shader_index_to_type(GLuint i)
{
static const GLenum enums[MESA_SHADER_TYPES] = {
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 7feeb90..2b5b3d5 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -49,7 +49,7 @@ _mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
/**
* Is the secondary color needed?
*/
-static INLINE GLboolean
+static inline GLboolean
_mesa_need_secondary_color(const struct gl_context *ctx)
{
if (ctx->Light.Enabled &&
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 51de9bf..50a5d11 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -82,33 +82,33 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
#include "main/compiler.h"
-static INLINE void
+static inline void
_mesa_init_sync_object_functions(struct dd_function_table *driver)
{
}
-static INLINE void
+static inline void
_mesa_init_sync_dispatch(struct _glapi_table *disp)
{
}
-static INLINE void
+static inline void
_mesa_init_sync(struct gl_context *ctx)
{
}
-static INLINE void
+static inline void
_mesa_free_sync_data(struct gl_context *ctx)
{
}
-static INLINE void
+static inline void
_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
{
ASSERT_NO_FEATURE();
}
-static INLINE void
+static inline void
_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
{
ASSERT_NO_FEATURE();
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 413156b..b180c80 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -66,7 +66,7 @@
* linear RGB value in [0, 1].
* Implemented with a 256-entry lookup table.
*/
-static INLINE GLfloat
+static inline GLfloat
nonlinear_to_linear(GLubyte cs8)
{
static GLfloat table[256];
diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h
index 709c35a..23793d1 100644
--- a/src/mesa/main/texcompress_s3tc.h
+++ b/src/mesa/main/texcompress_s3tc.h
@@ -100,7 +100,7 @@ _mesa_init_texture_s3tc(struct gl_context *ctx);
#define _mesa_fetch_texel_2d_f_srgba_dxt3 NULL
#define _mesa_fetch_texel_2d_f_srgba_dxt5 NULL
-static INLINE void
+static inline void
_mesa_init_texture_s3tc(struct gl_context *ctx)
{
}
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
index 336ffce..60a9522 100644
--- a/src/mesa/main/texgen.h
+++ b/src/mesa/main/texgen.h
@@ -69,12 +69,12 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
{
}
-static void INLINE
+static void inline
_mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
{
}
-static INLINE void
+static inline void
_mesa_init_texgen_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 62a55df..f911886 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -49,7 +49,7 @@
/**
* Can the given type represent negative values?
*/
-static INLINE GLboolean
+static inline GLboolean
type_with_negative_values(GLenum type)
{
switch (type) {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index daa71fd..8efe715 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2253,7 +2253,7 @@ update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj,
* changed the texture base level image, regenerate the rest of the
* mipmap levels now.
*/
-static INLINE void
+static inline void
check_gen_mipmap(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj, GLint level)
{
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 8ef1d45..6ce0fe9 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -136,7 +136,7 @@ _mesa_get_texture_dimensions(GLenum target);
/**
* Lock a texture for updating. See also _mesa_lock_context_textures().
*/
-static INLINE void
+static inline void
_mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
{
_glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
@@ -144,7 +144,7 @@ _mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
(void) texObj;
}
-static INLINE void
+static inline void
_mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
{
(void) texObj;
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 1faae6f..9ca7a4c 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -68,7 +68,7 @@ extern void
_mesa_reference_texobj_(struct gl_texture_object **ptr,
struct gl_texture_object *tex);
-static INLINE void
+static inline void
_mesa_reference_texobj(struct gl_texture_object **ptr,
struct gl_texture_object *tex)
{
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index f232cfc..dc5ee33 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -180,7 +180,7 @@ set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
* This is called just prior to changing any texture object state which
* will not effect texture completeness.
*/
-static INLINE void
+static inline void
flush(struct gl_context *ctx)
{
FLUSH_VERTICES(ctx, _NEW_TEXTURE);
@@ -195,7 +195,7 @@ flush(struct gl_context *ctx)
* state flag and then mark the texture object as 'incomplete' so that any
* per-texture derived state gets recomputed.
*/
-static INLINE void
+static inline void
incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)
{
FLUSH_VERTICES(ctx, _NEW_TEXTURE);
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 9871230..7dc6dc6 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -40,7 +40,7 @@
* Return pointer to current texture unit.
* This the texture unit set by glActiveTexture(), not glClientActiveTexture().
*/
-static INLINE struct gl_texture_unit *
+static inline struct gl_texture_unit *
_mesa_get_current_tex_unit(struct gl_context *ctx)
{
ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index b0d5b70..9447eff 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -110,24 +110,24 @@ _mesa_DrawTransformFeedback(GLenum mode, GLuint name);
#else /* FEATURE_EXT_transform_feedback */
-static INLINE GLboolean
+static inline GLboolean
_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)
{
return GL_TRUE;
}
-static INLINE GLboolean
+static inline GLboolean
_mesa_validate_transform_feedback_buffers(struct gl_context *ctx)
{
return GL_TRUE;
}
-static INLINE void
+static inline void
_mesa_init_transform_feedback_functions(struct dd_function_table *driver)
{
}
-static INLINE void
+static inline void
_mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
{
}
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 1c42320..6fcc0a3 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -41,7 +41,7 @@ struct gl_context;
* The array->_MaxElement field will be updated.
* Later in glDrawArrays/Elements/etc we can do some bounds checking.
*/
-static INLINE void
+static inline void
_mesa_update_array_max_element(struct gl_client_array *array)
{
assert(array->Enabled);
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 8bbc549..aac6568 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -44,12 +44,12 @@ extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexfor
#else /* FEATURE_beginend */
-static INLINE void
+static inline void
_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
{
}
-static INLINE void
+static inline void
_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
{
}
diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c
index 77f842a..848c2fe 100644
--- a/src/mesa/program/prog_execute.c
+++ b/src/mesa/program/prog_execute.c
@@ -84,7 +84,7 @@ static const GLfloat ZeroVec[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
* Return TRUE for +0 and other positive values, FALSE otherwise.
* Used for RCC opcode.
*/
-static INLINE GLboolean
+static inline GLboolean
positive(float x)
{
fi_type fi;
@@ -100,7 +100,7 @@ positive(float x)
* Return a pointer to the 4-element float vector specified by the given
* source register.
*/
-static INLINE const GLfloat *
+static inline const GLfloat *
get_src_register_pointer(const struct prog_src_register *source,
const struct gl_program_machine *machine)
{
@@ -176,7 +176,7 @@ get_src_register_pointer(const struct prog_src_register *source,
* Return a pointer to the 4-element float vector specified by the given
* destination register.
*/
-static INLINE GLfloat *
+static inline GLfloat *
get_dst_register_pointer(const struct prog_dst_register *dest,
struct gl_program_machine *machine)
{
@@ -383,7 +383,7 @@ fetch_vector1ui(const struct prog_src_register *source,
/**
* Fetch texel from texture. Use partial derivatives when possible.
*/
-static INLINE void
+static inline void
fetch_texel(struct gl_context *ctx,
const struct gl_program_machine *machine,
const struct prog_instruction *inst,
@@ -413,7 +413,7 @@ fetch_texel(struct gl_context *ctx,
/**
* Test value against zero and return GT, LT, EQ or UN if NaN.
*/
-static INLINE GLuint
+static inline GLuint
generate_cc(float value)
{
if (value != value)
@@ -430,7 +430,7 @@ generate_cc(float value)
* Test if the ccMaskRule is satisfied by the given condition code.
* Used to mask destination writes according to the current condition code.
*/
-static INLINE GLboolean
+static inline GLboolean
test_cc(GLuint condCode, GLuint ccMaskRule)
{
switch (ccMaskRule) {
@@ -451,7 +451,7 @@ test_cc(GLuint condCode, GLuint ccMaskRule)
* Evaluate the 4 condition codes against a predicate and return GL_TRUE
* or GL_FALSE to indicate result.
*/
-static INLINE GLboolean
+static inline GLboolean
eval_condition(const struct gl_program_machine *machine,
const struct prog_instruction *inst)
{
diff --git a/src/mesa/program/prog_parameter.h b/src/mesa/program/prog_parameter.h
index 4c2773a..8811c46 100644
--- a/src/mesa/program/prog_parameter.h
+++ b/src/mesa/program/prog_parameter.h
@@ -114,7 +114,7 @@ extern struct gl_program_parameter_list *
_mesa_combine_parameter_lists(const struct gl_program_parameter_list *a,
const struct gl_program_parameter_list *b);
-static INLINE GLuint
+static inline GLuint
_mesa_num_parameters(const struct gl_program_parameter_list *list)
{
return list ? list->NumParameters : 0;
diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
index 0f32a6a..9cd1780 100644
--- a/src/mesa/program/program.h
+++ b/src/mesa/program/program.h
@@ -93,7 +93,7 @@ _mesa_reference_program_(struct gl_context *ctx,
struct gl_program **ptr,
struct gl_program *prog);
-static INLINE void
+static inline void
_mesa_reference_program(struct gl_context *ctx,
struct gl_program **ptr,
struct gl_program *prog)
@@ -102,7 +102,7 @@ _mesa_reference_program(struct gl_context *ctx,
_mesa_reference_program_(ctx, ptr, prog);
}
-static INLINE void
+static inline void
_mesa_reference_vertprog(struct gl_context *ctx,
struct gl_vertex_program **ptr,
struct gl_vertex_program *prog)
@@ -111,7 +111,7 @@ _mesa_reference_vertprog(struct gl_context *ctx,
(struct gl_program *) prog);
}
-static INLINE void
+static inline void
_mesa_reference_fragprog(struct gl_context *ctx,
struct gl_fragment_program **ptr,
struct gl_fragment_program *prog)
@@ -120,7 +120,7 @@ _mesa_reference_fragprog(struct gl_context *ctx,
(struct gl_program *) prog);
}
-static INLINE void
+static inline void
_mesa_reference_geomprog(struct gl_context *ctx,
struct gl_geometry_program **ptr,
struct gl_geometry_program *prog)
@@ -132,21 +132,21 @@ _mesa_reference_geomprog(struct gl_context *ctx,
extern struct gl_program *
_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog);
-static INLINE struct gl_vertex_program *
+static inline struct gl_vertex_program *
_mesa_clone_vertex_program(struct gl_context *ctx,
const struct gl_vertex_program *prog)
{
return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);
}
-static INLINE struct gl_geometry_program *
+static inline struct gl_geometry_program *
_mesa_clone_geometry_program(struct gl_context *ctx,
const struct gl_geometry_program *prog)
{
return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base);
}
-static INLINE struct gl_fragment_program *
+static inline struct gl_fragment_program *
_mesa_clone_fragment_program(struct gl_context *ctx,
const struct gl_fragment_program *prog)
{
@@ -185,7 +185,7 @@ _mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog);
/* keep these in the same order as TGSI_PROCESSOR_* */
-static INLINE GLuint
+static inline GLuint
_mesa_program_target_to_index(GLenum v)
{
switch(v)
@@ -202,7 +202,7 @@ _mesa_program_target_to_index(GLenum v)
}
}
-static INLINE GLenum
+static inline GLenum
_mesa_program_index_to_target(GLuint i)
{
GLenum enums[MESA_SHADER_TYPES] = {
diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c
index 65b9af0..d4b1805 100644
--- a/src/mesa/swrast/s_aaline.c
+++ b/src/mesa/swrast/s_aaline.c
@@ -130,7 +130,7 @@ compute_plane(GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1,
}
-static INLINE void
+static inline void
constant_plane(GLfloat value, GLfloat plane[4])
{
plane[0] = 0.0;
@@ -140,7 +140,7 @@ constant_plane(GLfloat value, GLfloat plane[4])
}
-static INLINE GLfloat
+static inline GLfloat
solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
{
const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
@@ -154,7 +154,7 @@ solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
/*
* Return 1 / solve_plane().
*/
-static INLINE GLfloat
+static inline GLfloat
solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
{
const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
@@ -168,7 +168,7 @@ solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
/*
* Solve plane and return clamped GLchan value.
*/
-static INLINE GLchan
+static inline GLchan
solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
{
const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
@@ -187,7 +187,7 @@ solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
/*
* Compute mipmap level of detail.
*/
-static INLINE GLfloat
+static inline GLfloat
compute_lambda(const GLfloat sPlane[4], const GLfloat tPlane[4],
GLfloat invQ, GLfloat width, GLfloat height)
{
diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c
index 2e8767a..c68fdf6 100644
--- a/src/mesa/swrast/s_aatriangle.c
+++ b/src/mesa/swrast/s_aatriangle.c
@@ -44,7 +44,7 @@
* vertices and the given Z values.
* A point (x,y,z) lies on plane iff a*x+b*y+c*z+d = 0.
*/
-static INLINE void
+static inline void
compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],
GLfloat z0, GLfloat z1, GLfloat z2, GLfloat plane[4])
{
@@ -77,7 +77,7 @@ compute_plane(const GLfloat v0[], const GLfloat v1[], const GLfloat v2[],
/*
* Compute coefficients of a plane with a constant Z value.
*/
-static INLINE void
+static inline void
constant_plane(GLfloat value, GLfloat plane[4])
{
plane[0] = 0.0;
@@ -99,7 +99,7 @@ do { \
/*
* Solve plane equation for Z at (X,Y).
*/
-static INLINE GLfloat
+static inline GLfloat
solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
{
ASSERT(plane[2] != 0.0F);
@@ -114,7 +114,7 @@ solve_plane(GLfloat x, GLfloat y, const GLfloat plane[4])
/*
* Return 1 / solve_plane().
*/
-static INLINE GLfloat
+static inline GLfloat
solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
{
const GLfloat denom = plane[3] + plane[0] * x + plane[1] * y;
@@ -128,7 +128,7 @@ solve_plane_recip(GLfloat x, GLfloat y, const GLfloat plane[4])
/*
* Solve plane and return clamped GLchan value.
*/
-static INLINE GLchan
+static inline GLchan
solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
{
const GLfloat z = (plane[3] + plane[0] * x + plane[1] * y) / -plane[2];
@@ -144,13 +144,13 @@ solve_plane_chan(GLfloat x, GLfloat y, const GLfloat plane[4])
}
-static INLINE GLfloat
+static inline GLfloat
plane_dx(const GLfloat plane[4])
{
return -plane[0] / plane[2];
}
-static INLINE GLfloat
+static inline GLfloat
plane_dy(const GLfloat plane[4])
{
return -plane[1] / plane[2];
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 7f53f19..f094be8 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -243,7 +243,7 @@ blit_nearest(struct gl_context *ctx,
#define LERP(T, A, B) ( (A) + (T) * ((B) - (A)) )
-static INLINE GLfloat
+static inline GLfloat
lerp_2d(GLfloat a, GLfloat b,
GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)
{
diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 1e0bfc0..12ad688 100644
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -163,14 +163,14 @@ struct swrast_texture_image
/** cast wrapper */
-static INLINE struct swrast_texture_image *
+static inline struct swrast_texture_image *
swrast_texture_image(struct gl_texture_image *img)
{
return (struct swrast_texture_image *) img;
}
/** cast wrapper */
-static INLINE const struct swrast_texture_image *
+static inline const struct swrast_texture_image *
swrast_texture_image_const(const struct gl_texture_image *img)
{
return (const struct swrast_texture_image *) img;
@@ -308,14 +308,14 @@ _swrast_update_texture_samplers(struct gl_context *ctx);
/** Return SWcontext for the given struct gl_context */
-static INLINE SWcontext *
+static inline SWcontext *
SWRAST_CONTEXT(struct gl_context *ctx)
{
return (SWcontext *) ctx->swrast_context;
}
/** const version of above */
-static INLINE const SWcontext *
+static inline const SWcontext *
CONST_SWRAST_CONTEXT(const struct gl_context *ctx)
{
return (const SWcontext *) ctx->swrast_context;
@@ -327,7 +327,7 @@ CONST_SWRAST_CONTEXT(const struct gl_context *ctx)
* For drivers that rely on swrast for fallback rendering, this is the
* driver's opportunity to map renderbuffers and textures.
*/
-static INLINE void
+static inline void
swrast_render_start(struct gl_context *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -337,7 +337,7 @@ swrast_render_start(struct gl_context *ctx)
/** Called after framebuffer reading/writing */
-static INLINE void
+static inline void
swrast_render_finish(struct gl_context *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 9513b1c..7f205a2 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -35,7 +35,7 @@
* Apply texture object's swizzle (X/Y/Z/W/0/1) to incoming 'texel'
* and return results in 'colorOut'.
*/
-static INLINE void
+static inline void
swizzle_texel(const GLfloat texel[4], GLfloat colorOut[4], GLuint swizzle)
{
if (swizzle == SWIZZLE_NOOP) {
diff --git a/src/mesa/swrast/s_logic.c b/src/mesa/swrast/s_logic.c
index b93b4b7..80ee46c 100644
--- a/src/mesa/swrast/s_logic.c
+++ b/src/mesa/swrast/s_logic.c
@@ -157,7 +157,7 @@ do { \
-static INLINE void
+static inline void
logicop_uint1(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],
const GLubyte mask[])
{
@@ -165,7 +165,7 @@ logicop_uint1(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[
}
-static INLINE void
+static inline void
logicop_uint2(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],
const GLubyte mask[])
{
@@ -173,7 +173,7 @@ logicop_uint2(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[
}
-static INLINE void
+static inline void
logicop_uint4(struct gl_context *ctx, GLuint n, GLuint src[], const GLuint dest[],
const GLubyte mask[])
{
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index 06c6ef4..11b7ef7 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -51,7 +51,7 @@
* or just the glPointSize value.
* Must also clamp to user-defined range and implmentation limits.
*/
-static INLINE GLfloat
+static inline GLfloat
get_size(const struct gl_context *ctx, const SWvertex *vert, GLboolean smoothed)
{
GLfloat size;
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 4631ff3..1aa20f9 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -162,7 +162,7 @@ _swrast_span_default_attribs(struct gl_context *ctx, SWspan *span)
* Perspective correction will be done. The point/line/triangle function
* should have computed attrStart/Step values for FRAG_ATTRIB_WPOS[3]!
*/
-static INLINE void
+static inline void
interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attrMask)
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -209,7 +209,7 @@ interpolate_active_attribs(struct gl_context *ctx, SWspan *span, GLbitfield attr
* Interpolate primary colors to fill in the span->array->rgba8 (or rgb16)
* color array.
*/
-static INLINE void
+static inline void
interpolate_int_colors(struct gl_context *ctx, SWspan *span)
{
#if CHAN_BITS != 32
@@ -309,7 +309,7 @@ interpolate_int_colors(struct gl_context *ctx, SWspan *span)
/**
* Populate the FRAG_ATTRIB_COL0 array.
*/
-static INLINE void
+static inline void
interpolate_float_colors(SWspan *span)
{
GLfloat (*col0)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
@@ -611,7 +611,7 @@ interpolate_texcoords(struct gl_context *ctx, SWspan *span)
/**
* Fill in the arrays->attribs[FRAG_ATTRIB_WPOS] array.
*/
-static INLINE void
+static inline void
interpolate_wpos(struct gl_context *ctx, SWspan *span)
{
GLfloat (*wpos)[4] = span->array->attribs[FRAG_ATTRIB_WPOS];
@@ -645,7 +645,7 @@ interpolate_wpos(struct gl_context *ctx, SWspan *span)
/**
* Apply the current polygon stipple pattern to a span of pixels.
*/
-static INLINE void
+static inline void
stipple_polygon_span(struct gl_context *ctx, SWspan *span)
{
GLubyte *mask = span->array->mask;
@@ -690,7 +690,7 @@ stipple_polygon_span(struct gl_context *ctx, SWspan *span)
* Return: GL_TRUE some pixels still visible
* GL_FALSE nothing visible
*/
-static INLINE GLuint
+static inline GLuint
clip_span( struct gl_context *ctx, SWspan *span )
{
const GLint xmin = ctx->DrawBuffer->_Xmin;
@@ -817,7 +817,7 @@ clip_span( struct gl_context *ctx, SWspan *span )
* Only called during fixed-function operation.
* Result is float color array (FRAG_ATTRIB_COL0).
*/
-static INLINE void
+static inline void
add_specular(struct gl_context *ctx, SWspan *span)
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -866,7 +866,7 @@ add_specular(struct gl_context *ctx, SWspan *span)
/**
* Apply antialiasing coverage value to alpha values.
*/
-static INLINE void
+static inline void
apply_aa_coverage(SWspan *span)
{
const GLfloat *coverage = span->array->coverage;
@@ -900,7 +900,7 @@ apply_aa_coverage(SWspan *span)
/**
* Clamp span's float colors to [0,1]
*/
-static INLINE void
+static inline void
clamp_colors(SWspan *span)
{
GLfloat (*rgba)[4] = span->array->attribs[FRAG_ATTRIB_COL0];
@@ -921,7 +921,7 @@ clamp_colors(SWspan *span)
* program that writes to gl_FragData[1] or higher.
* \param output which fragment program color output is being processed
*/
-static INLINE void
+static inline void
convert_color_type(SWspan *span, GLenum newType, GLuint output)
{
GLvoid *src, *dst;
@@ -961,7 +961,7 @@ convert_color_type(SWspan *span, GLenum newType, GLuint output)
/**
* Apply fragment shader, fragment program or normal texturing to span.
*/
-static INLINE void
+static inline void
shade_texture_span(struct gl_context *ctx, SWspan *span)
{
if (ctx->FragmentProgram._Current ||
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index fa5093a..e713e23 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -391,7 +391,7 @@ do_stencil_test( struct gl_context *ctx, GLuint face, GLuint n, GLstencil stenci
* Compute the zpass/zfail masks by comparing the pre- and post-depth test
* masks.
*/
-static INLINE void
+static inline void
compute_pass_fail_masks(GLuint n, const GLubyte origMask[],
const GLubyte newMask[],
GLubyte passMask[], GLubyte failMask[])
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 80b9dff..6944edf 100644
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -45,7 +45,7 @@ typedef float (*float4_array)[4];
/**
* Return array of texels for given unit.
*/
-static INLINE float4_array
+static inline float4_array
get_texel_array(SWcontext *swrast, GLuint unit)
{
#ifdef _OPENMP
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index ed17b4b..73b5af3 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -51,7 +51,7 @@
* linear RGB value in [0, 1].
* Implemented with a 256-entry lookup table.
*/
-static INLINE GLfloat
+static inline GLfloat
nonlinear_to_linear(GLubyte cs8)
{
static GLfloat table[256];
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index dd37619..ca9133b 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -57,7 +57,7 @@
* optimization! If we find that's not true on some systems, convert
* to a macro.
*/
-static INLINE GLfloat
+static inline GLfloat
lerp_2d(GLfloat a, GLfloat b,
GLfloat v00, GLfloat v10, GLfloat v01, GLfloat v11)
{
@@ -71,7 +71,7 @@ lerp_2d(GLfloat a, GLfloat b,
* Do 3D/trilinear interpolation of float values.
* \sa lerp_2d
*/
-static INLINE GLfloat
+static inline GLfloat
lerp_3d(GLfloat a, GLfloat b, GLfloat c,
GLfloat v000, GLfloat v100, GLfloat v010, GLfloat v110,
GLfloat v001, GLfloat v101, GLfloat v011, GLfloat v111)
@@ -89,7 +89,7 @@ lerp_3d(GLfloat a, GLfloat b, GLfloat c,
/**
* Do linear interpolation of colors.
*/
-static INLINE void
+static inline void
lerp_rgba(GLfloat result[4], GLfloat t, const GLfloat a[4], const GLfloat b[4])
{
result[0] = LERP(t, a[0], b[0]);
@@ -102,7 +102,7 @@ lerp_rgba(GLfloat result[4], GLfloat t, const GLfloat a[4], const GLfloat b[4])
/**
* Do bilinear interpolation of colors.
*/
-static INLINE void
+static inline void
lerp_rgba_2d(GLfloat result[4], GLfloat a, GLfloat b,
const GLfloat t00[4], const GLfloat t10[4],
const GLfloat t01[4], const GLfloat t11[4])
@@ -117,7 +117,7 @@ lerp_rgba_2d(GLfloat result[4], GLfloat a, GLfloat b,
/**
* Do trilinear interpolation of colors.
*/
-static INLINE void
+static inline void
lerp_rgba_3d(GLfloat result[4], GLfloat a, GLfloat b, GLfloat c,
const GLfloat t000[4], const GLfloat t100[4],
const GLfloat t010[4], const GLfloat t110[4],
@@ -153,7 +153,7 @@ lerp_rgba_3d(GLfloat result[4], GLfloat a, GLfloat b, GLfloat c,
* i0, i1 = returns two nearest texel indexes
* weight = returns blend factor between texels
*/
-static INLINE void
+static inline void
linear_texel_locations(GLenum wrapMode,
const struct gl_texture_image *img,
GLint size, GLfloat s,
@@ -281,7 +281,7 @@ linear_texel_locations(GLenum wrapMode,
/**
* Used to compute texel location for nearest sampling.
*/
-static INLINE GLint
+static inline GLint
nearest_texel_location(GLenum wrapMode,
const struct gl_texture_image *img,
GLint size, GLfloat s)
@@ -406,7 +406,7 @@ nearest_texel_location(GLenum wrapMode,
/* Power of two image sizes only */
-static INLINE void
+static inline void
linear_repeat_texel_location(GLuint size, GLfloat s,
GLint *i0, GLint *i1, GLfloat *weight)
{
@@ -420,7 +420,7 @@ linear_repeat_texel_location(GLuint size, GLfloat s,
/**
* Do clamp/wrap for a texture rectangle coord, GL_NEAREST filter mode.
*/
-static INLINE GLint
+static inline GLint
clamp_rect_coord_nearest(GLenum wrapMode, GLfloat coord, GLint max)
{
switch (wrapMode) {
@@ -440,7 +440,7 @@ clamp_rect_coord_nearest(GLenum wrapMode, GLfloat coord, GLint max)
/**
* As above, but GL_LINEAR filtering.
*/
-static INLINE void
+static inline void
clamp_rect_coord_linear(GLenum wrapMode, GLfloat coord, GLint max,
GLint *i0out, GLint *i1out, GLfloat *weight)
{
@@ -481,7 +481,7 @@ clamp_rect_coord_linear(GLenum wrapMode, GLfloat coord, GLint max,
/**
* Compute slice/image to use for 1D or 2D array texture.
*/
-static INLINE GLint
+static inline GLint
tex_array_slice(GLfloat coord, GLsizei size)
{
GLint slice = IFLOOR(coord + 0.5f);
@@ -494,7 +494,7 @@ tex_array_slice(GLfloat coord, GLsizei size)
* Compute nearest integer texcoords for given texobj and coordinate.
* NOTE: only used for depth texture sampling.
*/
-static INLINE void
+static inline void
nearest_texcoord(const struct gl_texture_object *texObj,
GLuint level,
const GLfloat texcoord[4],
@@ -541,7 +541,7 @@ nearest_texcoord(const struct gl_texture_object *texObj,
* Compute linear integer texcoords for given texobj and coordinate.
* NOTE: only used for depth texture sampling.
*/
-static INLINE void
+static inline void
linear_texcoord(const struct gl_texture_object *texObj,
GLuint level,
const GLfloat texcoord[4],
@@ -598,7 +598,7 @@ linear_texcoord(const struct gl_texture_object *texObj,
* For linear interpolation between mipmap levels N and N+1, this function
* computes N.
*/
-static INLINE GLint
+static inline GLint
linear_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
{
if (lambda < 0.0F)
@@ -613,7 +613,7 @@ linear_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
/**
* Compute the nearest mipmap level to take texels from.
*/
-static INLINE GLint
+static inline GLint
nearest_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
{
GLfloat l;
@@ -649,7 +649,7 @@ nearest_mipmap_level(const struct gl_texture_object *tObj, GLfloat lambda)
* will be minified, magnified, or split between the two. This function
* determines the subranges in [0, n-1] that are to be minified or magnified.
*/
-static INLINE void
+static inline void
compute_min_mag_ranges(const struct gl_texture_object *tObj,
GLuint n, const GLfloat lambda[],
GLuint *minStart, GLuint *minEnd,
@@ -758,7 +758,7 @@ compute_min_mag_ranges(const struct gl_texture_object *tObj,
* the base texture format. Ex: if the texture base format it GL_ALPHA,
* we return (0,0,0,BorderAlpha).
*/
-static INLINE void
+static inline void
get_border_color(const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
GLfloat rgba[4])
@@ -798,7 +798,7 @@ get_border_color(const struct gl_texture_object *tObj,
/**
* Return the texture sample for coordinate (s) using GL_NEAREST filter.
*/
-static INLINE void
+static inline void
sample_1d_nearest(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -823,7 +823,7 @@ sample_1d_nearest(struct gl_context *ctx,
/**
* Return the texture sample for coordinate (s) using GL_LINEAR filter.
*/
-static INLINE void
+static inline void
sample_1d_linear(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -1057,7 +1057,7 @@ sample_lambda_1d( struct gl_context *ctx,
/**
* Return the texture sample for coordinate (s,t) using GL_NEAREST filter.
*/
-static INLINE void
+static inline void
sample_2d_nearest(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -1091,7 +1091,7 @@ sample_2d_nearest(struct gl_context *ctx,
* Return the texture sample for coordinate (s,t) using GL_LINEAR filter.
* New sampling code contributed by Lynn Quam <quam at ai.sri.com>.
*/
-static INLINE void
+static inline void
sample_2d_linear(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -1156,7 +1156,7 @@ sample_2d_linear(struct gl_context *ctx,
* As above, but we know WRAP_S == REPEAT and WRAP_T == REPEAT.
* We don't have to worry about the texture border.
*/
-static INLINE void
+static inline void
sample_2d_linear_repeat(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -1760,7 +1760,7 @@ sample_2d_footprint(struct gl_context *ctx,
* Returns the index of the specified texture object in the
* gl_context texture unit array.
*/
-static INLINE GLuint
+static inline GLuint
texture_unit_index(const struct gl_context *ctx,
const struct gl_texture_object *tObj)
{
@@ -1941,7 +1941,7 @@ sample_lambda_2d_aniso(struct gl_context *ctx,
/**
* Return the texture sample for coordinate (s,t,r) using GL_NEAREST filter.
*/
-static INLINE void
+static inline void
sample_3d_nearest(struct gl_context *ctx,
const struct gl_texture_object *tObj,
const struct gl_texture_image *img,
@@ -3282,7 +3282,7 @@ sample_lambda_1d_array(struct gl_context *ctx,
/**
* Compare texcoord against depth sample. Return 1.0 or the ambient value.
*/
-static INLINE GLfloat
+static inline GLfloat
shadow_compare(GLenum function, GLfloat coord, GLfloat depthSample,
GLfloat ambient)
{
@@ -3315,7 +3315,7 @@ shadow_compare(GLenum function, GLfloat coord, GLfloat depthSample,
/**
* Compare texcoord against four depth samples.
*/
-static INLINE GLfloat
+static inline GLfloat
shadow_compare4(GLenum function, GLfloat coord,
GLfloat depth00, GLfloat depth01,
GLfloat depth10, GLfloat depth11,
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 77bd2a3..839c4fd 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -237,13 +237,13 @@ struct affine_info
};
-static INLINE GLint
+static inline GLint
ilerp(GLint t, GLint a, GLint b)
{
return a + ((t * (b - a)) >> FIXED_SHIFT);
}
-static INLINE GLint
+static inline GLint
ilerp_2d(GLint ia, GLint ib, GLint v00, GLint v10, GLint v01, GLint v11)
{
const GLint temp0 = ilerp(ia, v00, v10);
@@ -256,7 +256,7 @@ ilerp_2d(GLint ia, GLint ib, GLint v00, GLint v10, GLint v01, GLint v11)
* textures with GL_REPLACE, GL_MODULATE, GL_BLEND, GL_DECAL or GL_ADD
* texture env modes.
*/
-static INLINE void
+static inline void
affine_span(struct gl_context *ctx, SWspan *span,
struct affine_info *info)
{
@@ -591,7 +591,7 @@ struct persp_info
};
-static INLINE void
+static inline void
fast_persp_span(struct gl_context *ctx, SWspan *span,
struct persp_info *info)
{
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index 4e04691..3fb7848 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -105,7 +105,7 @@ compute_zoomed_bounds(struct gl_context *ctx, GLint imageX, GLint imageY,
* return corresponding x coord in the original, unzoomed image.
* This can use this for unzooming X or Y values.
*/
-static INLINE GLint
+static inline GLint
unzoom_x(GLfloat zoomX, GLint imageX, GLint zx)
{
/*
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index f5d8f74..3e0c80d 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -48,7 +48,7 @@
#ifdef NAN_CHECK
/** Check for NaNs and very large values */
-static INLINE void
+static inline void
check_float(float x)
{
assert(!IS_INF_OR_NAN(x));
diff --git a/src/mesa/tnl/t_vertex_generic.c b/src/mesa/tnl/t_vertex_generic.c
index 9dcecdd..7b7f511 100644
--- a/src/mesa/tnl/t_vertex_generic.c
+++ b/src/mesa/tnl/t_vertex_generic.c
@@ -47,7 +47,7 @@
* NDC->Viewport mapping and store the results at 'v'.
*/
-static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -59,7 +59,7 @@ static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLu
out[3] = in[3];
}
-static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -71,7 +71,7 @@ static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLu
out[3] = 1;
}
-static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -83,7 +83,7 @@ static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLu
out[3] = 1;
}
-static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -95,7 +95,7 @@ static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLu
out[3] = 1;
}
-static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -106,7 +106,7 @@ static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLu
out[2] = vp[10] * in[2] + vp[14];
}
-static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -117,7 +117,7 @@ static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLu
out[2] = vp[14];
}
-static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -128,7 +128,7 @@ static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLu
out[2] = vp[14];
}
-static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -138,7 +138,7 @@ static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLu
out[1] = vp[5] * in[1] + vp[13];
}
-static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLfloat *out = (GLfloat *)v;
@@ -153,7 +153,7 @@ static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLu
* These functions do the same as above, except for the viewport mapping.
*/
-static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -164,7 +164,7 @@ static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v,
out[3] = in[3];
}
-static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -175,7 +175,7 @@ static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v,
out[3] = 1;
}
-static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -186,7 +186,7 @@ static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
out[3] = 1;
}
-static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -197,7 +197,7 @@ static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
out[3] = 1;
}
-static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -207,14 +207,14 @@ static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte
out[2] = in[3];
}
-static INLINE void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
(void) a; (void) v; (void) in;
DEBUG_INSERT;
exit(1);
}
-static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -224,7 +224,7 @@ static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v,
out[2] = in[2];
}
-static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -234,7 +234,7 @@ static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
out[2] = 0;
}
-static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -245,7 +245,7 @@ static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
}
-static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -254,7 +254,7 @@ static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
out[1] = in[1];
}
-static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -263,7 +263,7 @@ static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
out[1] = 0;
}
-static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
GLfloat *out = (GLfloat *)(v);
(void) a;
@@ -271,13 +271,13 @@ static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
out[0] = in[0];
}
-static INLINE void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
{
DEBUG_INSERT;
(void) a; (void) v; (void) in;
}
-static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLchan *c = (GLchan *)v;
@@ -289,7 +289,7 @@ static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, G
UNCLAMPED_FLOAT_TO_CHAN(c[3], in[3]);
}
-static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLchan *c = (GLchan *)v;
@@ -301,7 +301,7 @@ static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, G
c[3] = CHAN_MAX;
}
-static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLchan *c = (GLchan *)v;
@@ -313,7 +313,7 @@ static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, G
c[3] = CHAN_MAX;
}
-static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
GLchan *c = (GLchan *)v;
@@ -325,7 +325,7 @@ static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, G
c[3] = CHAN_MAX;
}
-static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -336,7 +336,7 @@ static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLu
UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
}
-static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -347,7 +347,7 @@ static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -358,7 +358,7 @@ static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -369,7 +369,7 @@ static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -380,7 +380,7 @@ static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLu
UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
}
-static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -391,7 +391,7 @@ static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -402,7 +402,7 @@ static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -413,7 +413,7 @@ static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLu
v[3] = 0xff;
}
-static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -424,7 +424,7 @@ static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLu
UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
}
-static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -435,7 +435,7 @@ static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -446,7 +446,7 @@ static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -457,7 +457,7 @@ static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -468,7 +468,7 @@ static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLu
UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
}
-static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -479,7 +479,7 @@ static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -490,7 +490,7 @@ static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -501,7 +501,7 @@ static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLu
v[0] = 0xff;
}
-static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -511,7 +511,7 @@ static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLub
UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
}
-static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -521,7 +521,7 @@ static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLub
v[2] = 0;
}
-static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -531,7 +531,7 @@ static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLub
v[2] = 0;
}
-static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -541,7 +541,7 @@ static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLub
UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
}
-static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -551,7 +551,7 @@ static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLub
v[0] = 0;
}
-static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
@@ -562,7 +562,7 @@ static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLub
}
-static INLINE void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
const GLfloat *in )
{
DEBUG_INSERT;
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index e102383..0bf5c91 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -59,12 +59,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
-static INLINE float conv_ui10_to_norm_float(unsigned ui10)
+static inline float conv_ui10_to_norm_float(unsigned ui10)
{
return (float)(ui10) / 1023.0;
}
-static INLINE float conv_ui2_to_norm_float(unsigned ui2)
+static inline float conv_ui2_to_norm_float(unsigned ui2)
{
return (float)(ui2) / 3.0;
}
@@ -91,28 +91,28 @@ static INLINE float conv_ui2_to_norm_float(unsigned ui2)
struct attr_bits_10 {signed int x:10;};
struct attr_bits_2 {signed int x:2;};
-static INLINE float conv_i10_to_i(int i10)
+static inline float conv_i10_to_i(int i10)
{
struct attr_bits_10 val;
val.x = i10;
return (float)val.x;
}
-static INLINE float conv_i2_to_i(int i2)
+static inline float conv_i2_to_i(int i2)
{
struct attr_bits_2 val;
val.x = i2;
return (float)val.x;
}
-static INLINE float conv_i10_to_norm_float(int i10)
+static inline float conv_i10_to_norm_float(int i10)
{
struct attr_bits_10 val;
val.x = i10;
return (2.0F * (float)val.x + 1.0F) * (1.0F / 511.0F);
}
-static INLINE float conv_i2_to_norm_float(int i2)
+static inline float conv_i2_to_norm_float(int i2)
{
struct attr_bits_2 val;
val.x = i2;
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index 2ded6cc..ef8a2a2 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -86,7 +86,7 @@ struct vbo_context {
};
-static INLINE struct vbo_context *vbo_context(struct gl_context *ctx)
+static inline struct vbo_context *vbo_context(struct gl_context *ctx)
{
return (struct vbo_context *)(ctx->swtnl_im);
}
@@ -96,7 +96,7 @@ static INLINE struct vbo_context *vbo_context(struct gl_context *ctx)
* Return VP_x token to indicate whether we're running fixed-function
* vertex transformation, an NV vertex program or ARB vertex program/shader.
*/
-static INLINE enum vp_mode
+static inline enum vp_mode
get_program_mode( struct gl_context *ctx )
{
if (!ctx->VertexProgram._Current)
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index d52a557..9a1b5a1 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -179,12 +179,12 @@ void vbo_exec_vtx_map( struct vbo_exec_context *exec );
#else /* FEATURE_beginend */
-static INLINE void
+static inline void
vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
{
}
-static INLINE void
+static inline void
vbo_exec_vtx_map( struct vbo_exec_context *exec )
{
}
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 45cd299..a064090 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -187,12 +187,12 @@ void vbo_save_api_init( struct vbo_save_context *save );
#else /* FEATURE_dlist */
-static INLINE void
+static inline void
vbo_save_init( struct gl_context *ctx )
{
}
-static INLINE void
+static inline void
vbo_save_destroy( struct gl_context *ctx )
{
}
--
1.7.3.4
More information about the mesa-dev
mailing list