KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace __inline and __inline__ with INLINE macro

This commit is contained in:
Brian Paul 2008-06-21 10:49:45 -06:00
parent 402e7f76b1
commit 37f19b94ac
14 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/dri/nouveau/nouveau_shader.h
View File

@ -396,21 +396,21 @@ struct _nvsFunc {
int (*GetLoopIncrement) (nvsFunc *);
};
static inline nvsRegister
static INLINE nvsRegister
nvsNegate(nvsRegister reg)
{
reg.negate = !reg.negate;
return reg;
}
static inline nvsRegister
static INLINE nvsRegister
nvsAbs(nvsRegister reg)
{
reg.abs = 1;
return reg;
}
static inline nvsRegister
static INLINE nvsRegister
nvsSwizzle(nvsRegister reg, nvsSwzComp x, nvsSwzComp y,
nvsSwzComp z, nvsSwzComp w)
{

16
src/mesa/drivers/dri/nouveau/nv04_swtcl.c
View File

@ -53,7 +53,7 @@ static void nv04RenderPrimitive( GLcontext *ctx, GLenum prim );
static void nv04ResetLineStipple( GLcontext *ctx );
static inline void nv04_2triangles(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2,nouveauVertex* v3,nouveauVertex* v4,nouveauVertex* v5)
static INLINE void nv04_2triangles(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2,nouveauVertex* v3,nouveauVertex* v4,nouveauVertex* v5)
{
BEGIN_RING_SIZE(NvSub3D,NV04_DX5_TEXTURED_TRIANGLE_TLVERTEX_SX(0xA),49);
OUT_RINGp(v0,8);
@ -65,7 +65,7 @@ static inline void nv04_2triangles(struct nouveau_context *nmesa,nouveauVertex*
OUT_RING(0xFEDCBA);
}
static inline void nv04_1triangle(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2)
static INLINE void nv04_1triangle(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2)
{
BEGIN_RING_SIZE(NvSub3D,NV04_DX5_TEXTURED_TRIANGLE_TLVERTEX_SX(0xD),25);
OUT_RINGp(v0,8);
@ -74,7 +74,7 @@ static inline void nv04_1triangle(struct nouveau_context *nmesa,nouveauVertex* v
OUT_RING(0xFED);
}
static inline void nv04_1quad(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2,nouveauVertex* v3)
static INLINE void nv04_1quad(struct nouveau_context *nmesa,nouveauVertex* v0,nouveauVertex* v1,nouveauVertex* v2,nouveauVertex* v3)
{
BEGIN_RING_SIZE(NvSub3D,NV04_DX5_TEXTURED_TRIANGLE_TLVERTEX_SX(0xC),33);
OUT_RINGp(v0,8);
@ -84,17 +84,17 @@ static inline void nv04_1quad(struct nouveau_context *nmesa,nouveauVertex* v0,no
OUT_RING(0xFECEDC);
}
static inline void nv04_render_points(GLcontext *ctx,GLuint first,GLuint last)
static INLINE void nv04_render_points(GLcontext *ctx,GLuint first,GLuint last)
{
WARN_ONCE("Unimplemented\n");
}
static inline void nv04_render_line(GLcontext *ctx,GLuint v1,GLuint v2)
static INLINE void nv04_render_line(GLcontext *ctx,GLuint v1,GLuint v2)
{
WARN_ONCE("Unimplemented\n");
}
static inline void nv04_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3)
static INLINE void nv04_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLubyte *vertptr = (GLubyte *)nmesa->verts;
@ -107,7 +107,7 @@ static inline void nv04_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuin
);
}
static inline void nv04_render_quad(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3,GLuint v4)
static INLINE void nv04_render_quad(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3,GLuint v4)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLubyte *vertptr = (GLubyte *)nmesa->verts;
@ -465,7 +465,7 @@ static void nv04ChooseRenderState(GLcontext *ctx)
static inline void nv04OutputVertexFormat(struct nouveau_context* nmesa)
static INLINE void nv04OutputVertexFormat(struct nouveau_context* nmesa)
{
GLcontext* ctx=nmesa->glCtx;
DECLARE_RENDERINPUTS(index);

20
src/mesa/drivers/dri/nouveau/nv10_swtcl.c
View File

@ -100,7 +100,7 @@ static const int default_attr_size[8]={3,3,3,4,3,1,4,4};
#endif
static inline void nv10StartPrimitive(struct nouveau_context* nmesa,GLuint primitive,GLuint size)
static INLINE void nv10StartPrimitive(struct nouveau_context* nmesa,GLuint primitive,GLuint size)
{
if ((nmesa->screen->card->type>=NV_10) && (nmesa->screen->card->type<=NV_17))
BEGIN_RING_SIZE(NvSub3D,NV10_TCL_PRIMITIVE_3D_BEGIN_END,1);
@ -131,7 +131,7 @@ void nv10FinishPrimitive(struct nouveau_context *nmesa)
}
static inline void nv10ExtendPrimitive(struct nouveau_context* nmesa, int size)
static INLINE void nv10ExtendPrimitive(struct nouveau_context* nmesa, int size)
{
/* make sure there's enough room. if not, wait */
if (RING_AVAILABLE()<size)
@ -144,7 +144,7 @@ static inline void nv10ExtendPrimitive(struct nouveau_context* nmesa, int size)
/* Render unclipped begin/end objects */
/**********************************************************************/
static inline void nv10_render_generic_primitive_verts(GLcontext *ctx,GLuint start,GLuint count,GLuint flags,GLuint prim)
static INLINE void nv10_render_generic_primitive_verts(GLcontext *ctx,GLuint start,GLuint count,GLuint flags,GLuint prim)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLfloat *vertptr = (GLfloat *)nmesa->verts;
@ -230,7 +230,7 @@ static void (*nv10_render_tab_verts[GL_POLYGON+2])(GLcontext *,
};
static inline void nv10_render_generic_primitive_elts(GLcontext *ctx,GLuint start,GLuint count,GLuint flags,GLuint prim)
static INLINE void nv10_render_generic_primitive_elts(GLcontext *ctx,GLuint start,GLuint count,GLuint flags,GLuint prim)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLfloat *vertptr = (GLfloat *)nmesa->verts;
@ -332,7 +332,7 @@ do { \
nmesa->vertex_attr_count++; \
} while (0)
static inline void nv10_render_point(GLcontext *ctx, GLfloat *vertptr)
static INLINE void nv10_render_point(GLcontext *ctx, GLfloat *vertptr)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLuint vertsize = nmesa->vertex_size;
@ -344,7 +344,7 @@ static inline void nv10_render_point(GLcontext *ctx, GLfloat *vertptr)
nv10FinishPrimitive(nmesa);
}
static inline void nv10_render_points(GLcontext *ctx,GLuint first,GLuint last)
static INLINE void nv10_render_points(GLcontext *ctx,GLuint first,GLuint last)
{
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
@ -364,7 +364,7 @@ static inline void nv10_render_points(GLcontext *ctx,GLuint first,GLuint last)
}
}
static inline void nv10_render_line(GLcontext *ctx,GLuint v1,GLuint v2)
static INLINE void nv10_render_line(GLcontext *ctx,GLuint v1,GLuint v2)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLfloat *vertptr = (GLfloat *)nmesa->verts;
@ -378,7 +378,7 @@ static inline void nv10_render_line(GLcontext *ctx,GLuint v1,GLuint v2)
nv10FinishPrimitive(nmesa);
}
static inline void nv10_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3)
static INLINE void nv10_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLfloat *vertptr = (GLfloat *)nmesa->verts;
@ -393,7 +393,7 @@ static inline void nv10_render_triangle(GLcontext *ctx,GLuint v1,GLuint v2,GLuin
nv10FinishPrimitive(nmesa);
}
static inline void nv10_render_quad(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3,GLuint v4)
static INLINE void nv10_render_quad(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3,GLuint v4)
{
struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
GLfloat *vertptr = (GLfloat *)nmesa->verts;
@ -428,7 +428,7 @@ static void nv10ChooseRenderState(GLcontext *ctx)
static inline void nv10OutputVertexFormat(struct nouveau_context* nmesa)
static INLINE void nv10OutputVertexFormat(struct nouveau_context* nmesa)
{
GLcontext* ctx=nmesa->glCtx;
TNLcontext *tnl = TNL_CONTEXT(ctx);

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

@ -150,7 +150,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

@ -78,7 +78,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;
@ -95,7 +95,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;

20
src/mesa/drivers/dri/r300/r300_emit.h
View File

@ -50,7 +50,7 @@
#define CP_PACKET3( pkt, n ) \
(RADEON_CP_PACKET3 | (pkt) | ((n) << 16))
static inline uint32_t cmdpacket0(int reg, int count)
static INLINE uint32_t cmdpacket0(int reg, int count)
{
drm_r300_cmd_header_t cmd;
@ -62,7 +62,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;
@ -74,7 +74,7 @@ static inline uint32_t cmdvpu(int addr, int count)
return cmd.u;
}
static inline uint32_t cmdr500fp(int addr, int count, int type, int clamp)
static INLINE uint32_t cmdr500fp(int addr, int count, int type, int clamp)
{
drm_r300_cmd_header_t cmd;
@ -88,7 +88,7 @@ static inline uint32_t cmdr500fp(int addr, int count, int type, int clamp)
return cmd.u;
}
static inline uint32_t cmdpacket3(int packet)
static INLINE uint32_t cmdpacket3(int packet)
{
drm_r300_cmd_header_t cmd;
@ -98,7 +98,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;
@ -108,7 +108,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;
@ -118,7 +118,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;
@ -218,7 +218,7 @@ static inline uint32_t cmdpacify(void)
/**
* Must be sent to switch to 2d commands
*/
void static inline end_3d(r300ContextPtr rmesa)
void static INLINE end_3d(r300ContextPtr rmesa)
{
drm_radeon_cmd_header_t *cmd = NULL;
@ -227,7 +227,7 @@ void static inline end_3d(r300ContextPtr rmesa)
cmd[0].header.cmd_type = R300_CMD_END3D;
}
void static inline cp_delay(r300ContextPtr rmesa, unsigned short count)
void static INLINE cp_delay(r300ContextPtr rmesa, unsigned short count)
{
drm_radeon_cmd_header_t *cmd = NULL;
@ -236,7 +236,7 @@ void static inline cp_delay(r300ContextPtr rmesa, unsigned short count)
cmd[0].i = cmdcpdelay(count);
}
void static inline cp_wait(r300ContextPtr rmesa, unsigned char flags)
void static INLINE cp_wait(r300ContextPtr rmesa, unsigned char flags)
{
drm_radeon_cmd_header_t *cmd = NULL;

6
src/mesa/drivers/dri/r300/r300_fragprog_emit.c
View File

@ -584,7 +584,7 @@ static GLuint emit_const4fv(struct r300_pfs_compile_state *cs,
return reg;
}
static inline GLuint negate(GLuint r)
static INLINE GLuint negate(GLuint r)
{
REG_NEGS(r);
REG_NEGV(r);
@ -594,13 +594,13 @@ static inline GLuint negate(GLuint r)
/* Hack, to prevent clobbering sources used multiple times when
* emulating non-native instructions
*/
static inline GLuint keep(GLuint r)
static INLINE GLuint keep(GLuint r)
{
REG_SET_NO_USE(r, GL_TRUE);
return r;
}
static inline GLuint absolute(GLuint r)
static INLINE GLuint absolute(GLuint r)
{
REG_ABS(r);
return r;

2
src/mesa/drivers/dri/r300/r300_state.c
View File

@ -1853,7 +1853,7 @@ static void r500SetupRSUnit(GLcontext * ctx)
if(_nc>_p->vpu.count)_p->vpu.count=_nc;\
}while(0)
static inline void r300SetupVertexProgramFragment(r300ContextPtr r300, int dest, struct r300_vertex_shader_fragment *vsf)
static INLINE void r300SetupVertexProgramFragment(r300ContextPtr r300, int dest, struct r300_vertex_shader_fragment *vsf)
{
int i;

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

@ -186,7 +186,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;

10
src/mesa/drivers/dri/r300/r500_fragprog_emit.c
View File

@ -201,7 +201,7 @@ static const GLfloat LIT[] = {127.999999,
127.999999,
-127.999999};
static inline GLuint make_rgb_swizzle(struct prog_src_register src) {
static INLINE GLuint make_rgb_swizzle(struct prog_src_register src) {
GLuint swiz = 0x0;
GLuint temp;
/* This could be optimized, but it should be plenty fast already. */
@ -217,7 +217,7 @@ static inline GLuint make_rgb_swizzle(struct prog_src_register src) {
return swiz;
}
static inline GLuint make_rgba_swizzle(GLuint src) {
static INLINE GLuint make_rgba_swizzle(GLuint src) {
GLuint swiz = 0x0;
GLuint temp;
int i;
@ -230,7 +230,7 @@ static inline GLuint make_rgba_swizzle(GLuint src) {
return swiz;
}
static inline GLuint make_alpha_swizzle(struct prog_src_register src) {
static INLINE GLuint make_alpha_swizzle(struct prog_src_register src) {
GLuint swiz = GET_SWZ(src.Swizzle, 3);
if (swiz == 5) swiz++;
@ -241,14 +241,14 @@ static inline GLuint make_alpha_swizzle(struct prog_src_register src) {
return swiz;
}
static inline GLuint make_sop_swizzle(struct prog_src_register src) {
static INLINE GLuint make_sop_swizzle(struct prog_src_register src) {
GLuint swiz = GET_SWZ(src.Swizzle, 0);
if (swiz == 5) swiz++;
return swiz;
}
static inline GLuint make_strq_swizzle(struct prog_src_register src) {
static INLINE GLuint make_strq_swizzle(struct prog_src_register src) {
GLuint swiz = 0x0, temp = 0x0;
int i;
for (i = 0; i < 4; i++) {

6
src/mesa/drivers/dri/swrast/swrast_priv.h
View File

@ -92,19 +92,19 @@ struct swrast_renderbuffer {
GLuint pitch;
};
static inline __DRIcontext *
static INLINE __DRIcontext *
swrast_context(GLcontext *ctx)
{
return (__DRIcontext *) ctx;
}
static inline __DRIdrawable *
static INLINE __DRIdrawable *
swrast_drawable(GLframebuffer *fb)
{
return (__DRIdrawable *) fb;
}
static inline struct swrast_renderbuffer *
static INLINE struct swrast_renderbuffer *
swrast_renderbuffer(struct gl_renderbuffer *rb)
{
return (struct swrast_renderbuffer *) rb;

8
src/mesa/drivers/dri/swrast/swrast_spantemp.h
View File

@ -36,7 +36,7 @@
#ifndef _SWRAST_SPANTEMP_ONCE
#define _SWRAST_SPANTEMP_ONCE
static inline void
static INLINE void
PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
{
__DRIcontext *ctx = swrast_context(glCtx);
@ -50,7 +50,7 @@ PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
}
static inline void
static INLINE void
GET_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
{
__DRIcontext *ctx = swrast_context(glCtx);
@ -62,7 +62,7 @@ GET_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
read->loaderPrivate);
}
static inline void
static INLINE void
PUT_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
{
__DRIcontext *ctx = swrast_context(glCtx);
@ -75,7 +75,7 @@ PUT_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
draw->loaderPrivate);
}
static inline void
static INLINE void
GET_ROW( GLcontext *glCtx, GLint x, GLint y, GLuint n, char *row )
{
__DRIcontext *ctx = swrast_context(glCtx);

4
src/mesa/drivers/dri/trident/trident_context.h
View File

@ -54,14 +54,14 @@
#undef TAG
/* these require that base be dword-aligned */
static inline void MMIO_OUT32(unsigned char *base, unsigned int offset,
static INLINE void MMIO_OUT32(unsigned char *base, unsigned int offset,
unsigned int val)
{
unsigned int *addr = (unsigned int *)(base + offset);
*addr = val;
}
static inline unsigned int MMIO_IN32(unsigned char *base, unsigned int offset)
static INLINE unsigned int MMIO_IN32(unsigned char *base, unsigned int offset)
{
unsigned int *addr = (unsigned int *)(base + offset);
return *addr;