Mesa (master): nouveau: s/inline/INLINE/
Vinson Lee
vlee at kemper.freedesktop.org
Sat Jul 17 00:49:43 UTC 2010
Module: Mesa
Branch: master
Commit: e02c1e215eabd14d0f58415e3a8179b995109696
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e02c1e215eabd14d0f58415e3a8179b995109696
Author: Vinson Lee <vlee at vmware.com>
Date: Fri Jul 16 17:49:18 2010 -0700
nouveau: s/inline/INLINE/
---
src/gallium/drivers/nouveau/nouveau_screen.h | 6 +++---
src/gallium/drivers/nouveau/nouveau_util.h | 2 +-
src/gallium/drivers/nouveau/nouveau_winsys.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
index 8eacdff..8c29027 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
@@ -14,7 +14,7 @@ struct nouveau_screen {
unsigned index_buffer_flags;
};
-static inline struct nouveau_screen *
+static INLINE struct nouveau_screen *
nouveau_screen(struct pipe_screen *pscreen)
{
return (struct nouveau_screen *)pscreen;
@@ -67,13 +67,13 @@ void nouveau_screen_fini(struct nouveau_screen *);
-static __inline__ unsigned
+static INLINE unsigned
RING_3D(unsigned mthd, unsigned size)
{
return (7 << 13) | (size << 18) | mthd;
}
-static __inline__ unsigned
+static INLINE unsigned
RING_3D_NI(unsigned mthd, unsigned size)
{
return 0x40000000 | (7 << 13) | (size << 18) | mthd;
diff --git a/src/gallium/drivers/nouveau/nouveau_util.h b/src/gallium/drivers/nouveau/nouveau_util.h
index ed6e643..a5e8537 100644
--- a/src/gallium/drivers/nouveau/nouveau_util.h
+++ b/src/gallium/drivers/nouveau/nouveau_util.h
@@ -103,7 +103,7 @@ struct u_split_prim {
uint edgeflag_off:1;
};
-static inline void
+static INLINE void
u_split_prim_init(struct u_split_prim *s,
unsigned mode, unsigned start, unsigned count)
{
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index cd7da99..df79ca8 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -13,7 +13,7 @@
#include "nouveau/nouveau_resource.h"
#include "nouveau/nouveau_pushbuf.h"
-static inline uint32_t
+static INLINE uint32_t
nouveau_screen_transfer_flags(unsigned pipe)
{
uint32_t flags = 0;
More information about the mesa-commit
mailing list