diff options
author | Brian Paul <[email protected]> | 2011-09-30 21:03:42 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2011-10-01 08:16:36 -0600 |
commit | 9520f483b8f1e45fa474674b415554988de5d8d3 (patch) | |
tree | abb7498ff771c9c0b1bc9034365170e2bf416ead /src/mesa/vbo | |
parent | c707ffa587137bda42ed557e2c5f6bb7ee02aca3 (diff) |
mesa: s/INLINE/inline/
INLINE is still seen in some files (some generated files, etc) but this
is a good start.
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r-- | src/mesa/vbo/vbo_attrib_tmp.h | 12 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_context.h | 4 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec.h | 4 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h index e1023834a93..0bf5c91658d 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 2ded6ccbff2..ef8a2a2b676 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 d52a557e03f..9a1b5a12786 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 45cd299798f..a064090cf1b 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 ) { } |