fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 01:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300: Just use "inline" rather than "__inline__".

Browse source
This commit is contained in:
Oliver McFadden 2007-05-19 05:41:55 +00:00
parent a2305ebfa2
commit 62b6eef0d7
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/r300/r300_cmdbuf.c
View file

@ -148,7 +148,7 @@ static void r300PrintStateAtom(r300ContextPtr r300, struct r300_state_atom *stat
* The caller must have ensured that there is enough space in the command
* buffer.
*/
static __inline__ void r300EmitAtoms(r300ContextPtr r300, GLboolean dirty)
static inline void r300EmitAtoms(r300ContextPtr r300, GLboolean dirty)
{
struct r300_state_atom *atom;
uint32_t *dest;

6
src/mesa/drivers/dri/r300/r300_cmdbuf.h
View file

@ -52,7 +52,7 @@ extern void r300DestroyCmdBuf(r300ContextPtr r300);
*
* \param dwords The number of dwords we need to be free on the command buffer
*/
static __inline__ void r300EnsureCmdBufSpace(r300ContextPtr r300,
static inline void r300EnsureCmdBufSpace(r300ContextPtr r300,
int dwords, const char *caller)
{
assert(dwords < r300->cmdbuf.size);
@ -68,7 +68,7 @@ static __inline__ void r300EnsureCmdBufSpace(r300ContextPtr r300,
* causes state reemission after a flush. This is necessary to ensure
* correct hardware state after an unlock.
*/
static __inline__ uint32_t *r300RawAllocCmdBuf(r300ContextPtr r300,
static inline uint32_t *r300RawAllocCmdBuf(r300ContextPtr r300,
int dwords, const char *caller)
{
uint32_t *ptr;
@ -80,7 +80,7 @@ static __inline__ uint32_t *r300RawAllocCmdBuf(r300ContextPtr r300,
return ptr;
}
static __inline__ uint32_t *r300AllocCmdBuf(r300ContextPtr r300,
static inline uint32_t *r300AllocCmdBuf(r300ContextPtr r300,
int dwords, const char *caller)
{
uint32_t *ptr;

4
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -80,7 +80,7 @@ typedef struct r300_context *r300ContextPtr;
/**
* This function takes a float and packs it into a uint32_t
*/
static __inline__ uint32_t r300PackFloat32(float fl)
static inline uint32_t r300PackFloat32(float fl)
{
union {
float fl;
@ -97,7 +97,7 @@ static __inline__ uint32_t r300PackFloat32(float fl)
* But it works for most things. I'll fix it later if someone
* else with a better clue doesn't
*/
static __inline__ uint32_t r300PackFloat24(float f)
static inline uint32_t r300PackFloat24(float f)
{
float mantissa;
int exponent;

12
src/mesa/drivers/dri/r300/r300_emit.h
View file

@ -59,7 +59,7 @@
#define CP_PACKET0(reg, n) (RADEON_CP_PACKET0 | ((n)<<16) | ((reg)>>2))
static __inline__ uint32_t cmdpacket0(int reg, int count)
static inline uint32_t cmdpacket0(int reg, int count)
{
drm_r300_cmd_header_t cmd;
@ -71,7 +71,7 @@ static __inline__ uint32_t cmdpacket0(int reg, int count)
return cmd.u;
}
static __inline__ uint32_t cmdvpu(int addr, int count)
static inline uint32_t cmdvpu(int addr, int count)
{
drm_r300_cmd_header_t cmd;
@ -83,7 +83,7 @@ static __inline__ uint32_t cmdvpu(int addr, int count)
return cmd.u;
}
static __inline__ uint32_t cmdpacket3(int packet)
static inline uint32_t cmdpacket3(int packet)
{
drm_r300_cmd_header_t cmd;
@ -93,7 +93,7 @@ static __inline__ uint32_t cmdpacket3(int packet)
return cmd.u;
}
static __inline__ uint32_t cmdcpdelay(unsigned short count)
static inline uint32_t cmdcpdelay(unsigned short count)
{
drm_r300_cmd_header_t cmd;
@ -103,7 +103,7 @@ static __inline__ uint32_t cmdcpdelay(unsigned short count)
return cmd.u;
}
static __inline__ uint32_t cmdwait(unsigned char flags)
static inline uint32_t cmdwait(unsigned char flags)
{
drm_r300_cmd_header_t cmd;
@ -113,7 +113,7 @@ static __inline__ uint32_t cmdwait(unsigned char flags)
return cmd.u;
}
static __inline__ uint32_t cmdpacify(void)
static inline uint32_t cmdpacify(void)
{
drm_r300_cmd_header_t cmd;

2
src/mesa/drivers/dri/r300/r300_vertprog.c
View file

@ -222,7 +222,7 @@ static unsigned long t_src_class(enum register_file file)
}
}
static __inline unsigned long t_swizzle(GLubyte swizzle)
static inline unsigned long t_swizzle(GLubyte swizzle)
{
/* this is in fact a NOP as the Mesa SWIZZLE_* are all identical to VSF_IN_COMPONENT_* */
return swizzle;