summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_wm_emit.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-06-24 14:08:08 -0700
committerEric Anholt <eric@anholt.net>2008-06-24 14:08:08 -0700
commitf6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch)
tree706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/i965/brw_wm_emit.c
parenta42dac187973cbc17be6c59db89264cbc935ab91 (diff)
parent5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff)
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_emit.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm_emit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_emit.c b/src/mesa/drivers/dri/i965/brw_wm_emit.c
index 4cda55914c..ba9168b6ef 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_emit.c
@@ -39,7 +39,7 @@
/* Not quite sure how correct this is - need to understand horiz
* vs. vertical strides a little better.
*/
-static __inline struct brw_reg sechalf( struct brw_reg reg )
+static INLINE struct brw_reg sechalf( struct brw_reg reg )
{
if (reg.vstride)
reg.nr++;