projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r128
/
r128_tex.h
diff --git
a/src/mesa/drivers/dri/r128/r128_tex.h
b/src/mesa/drivers/dri/r128/r128_tex.h
index 994dffb5a9a83cb42f7efa6b1c56a3c8d760b5c4..7df8decf76bbbb6c8d9d1104b7e5ed0c7c0f2c0d 100644
(file)
--- a/
src/mesa/drivers/dri/r128/r128_tex.h
+++ b/
src/mesa/drivers/dri/r128/r128_tex.h
@@
-67,9
+67,9
@@
extern void r128InitTextureFuncs( struct dd_function_table *functions );
#define R128PACKCOLOR4444( r, g, b, a ) \
((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
#define R128PACKCOLOR4444( r, g, b, a ) \
((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
-static
__inline__ u_
int32_t r128PackColor( GLuint cpp,
- GLubyte r, GLubyte g,
- GLubyte b, GLubyte a )
+static
INLINE u
int32_t r128PackColor( GLuint cpp,
+ GLubyte r, GLubyte g,
+ GLubyte b, GLubyte a )
{
switch ( cpp ) {
case 2:
{
switch ( cpp ) {
case 2: