aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/vbo
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-08 10:54:11 +0200
committermarha <marha@users.sourceforge.net>2011-09-08 10:54:11 +0200
commit23a7aebae0a742d94ffe2304357dcc1234a99155 (patch)
tree08dbd7956bbd1c5717967a4f904f8383139bbe1e /mesalib/src/mesa/vbo
parent53da0b7e7c183ea15692234332b3e337b3fb0cc0 (diff)
downloadvcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.tar.gz
vcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.tar.bz2
vcxsrv-23a7aebae0a742d94ffe2304357dcc1234a99155.zip
mesa git update 8 sep 2011
Diffstat (limited to 'mesalib/src/mesa/vbo')
-rw-r--r--mesalib/src/mesa/vbo/vbo_attrib_tmp.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index d6448dfb6..65717eb45 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/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;