diff options
author | Vinson Lee <[email protected]> | 2011-09-06 21:43:51 -0700 |
---|---|---|
committer | Vinson Lee <[email protected]> | 2011-09-06 21:43:51 -0700 |
commit | 6edef25a4b41583e1c285653fc0b84a316e9743d (patch) | |
tree | dd86e4619df5f6d9955fd977afda0a5e6a8ba396 | |
parent | 9bd8d90646572a170bd96a72d2f8d5739df381be (diff) |
mesa/vbo: s/inline/INLINE/
MSVC does not support inline keyword.
-rw-r--r-- | src/mesa/vbo/vbo_attrib_tmp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h index d6448dfb6a1..65717eb456b 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; |