Просмотр исходного кода

s/inline/INLINE/ to allow use of -ansi flag with gcc.

tags/texman_0_1_20060325
Brian Paul 20 лет назад
Родитель
Сommit
6484b373c3

+ 1
- 1
src/mesa/drivers/dri/i915/i830_context.h Просмотреть файл

@@ -201,7 +201,7 @@ i830InitMetaFuncs( struct i830_context *i830 );
* Inline conversion functions. These are better-typed than the
* macros used previously:
*/
static inline struct i830_context *
static INLINE struct i830_context *
i830_context( GLcontext *ctx )
{
return (struct i830_context *)ctx;

+ 1
- 1
src/mesa/drivers/dri/i915/i830_texblend.c Просмотреть файл

@@ -101,7 +101,7 @@ static GLuint emit_factor( GLuint blendUnit, GLuint *state, GLuint count,
}


static inline GLuint GetTexelOp(GLint unit)
static INLINE GLuint GetTexelOp(GLint unit)
{
switch(unit) {
case 0: return TEXBLENDARG_TEXEL0;

+ 1
- 1
src/mesa/drivers/dri/i915/i915_context.h Просмотреть файл

@@ -347,7 +347,7 @@ extern void i915InitFragProgFuncs( struct dd_function_table *functions );
* Inline conversion functions. These are better-typed than the
* macros used previously:
*/
static inline struct i915_context *
static INLINE struct i915_context *
i915_context( GLcontext *ctx )
{
return (struct i915_context *)ctx;

+ 2
- 2
src/mesa/drivers/dri/i915/i915_program.h Просмотреть файл

@@ -84,7 +84,7 @@

/* One neat thing about the UREG representation:
*/
static inline int swizzle( int reg, int x, int y, int z, int w )
static INLINE int swizzle( int reg, int x, int y, int z, int w )
{
return ((reg & ~UREG_XYZW_CHANNEL_MASK) |
CHANNEL_SRC( GET_CHANNEL_SRC( reg, x ), 0 ) |
@@ -95,7 +95,7 @@ static inline int swizzle( int reg, int x, int y, int z, int w )

/* Another neat thing about the UREG representation:
*/
static inline int negate( int reg, int x, int y, int z, int w )
static INLINE int negate( int reg, int x, int y, int z, int w )
{
return reg ^ (((x&1)<<UREG_CHANNEL_X_NEGATE_SHIFT)|
((y&1)<<UREG_CHANNEL_Y_NEGATE_SHIFT)|

+ 3
- 3
src/mesa/drivers/dri/i915/intel_batchbuffer.h Просмотреть файл

@@ -72,14 +72,14 @@ GLboolean intel_batchbuffer_emit_reloc( struct intel_batchbuffer *batch,
* be passed as structs rather than dwords, but that's a little bit of
* work...
*/
static inline GLuint
static INLINE GLuint
intel_batchbuffer_space( struct intel_batchbuffer *batch )
{
return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->map);
}


static inline void
static INLINE void
intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch,
GLuint dword)
{
@@ -89,7 +89,7 @@ intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch,
batch->ptr += 4;
}

static inline void
static INLINE void
intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
GLuint sz,
GLuint flags)

+ 1
- 1
src/mesa/drivers/dri/i915/intel_buffer_objects.h Просмотреть файл

@@ -58,7 +58,7 @@ void intel_bufferobj_init( struct intel_context *intel );
* the Name == 0 test is the only way to identify them and avoid
* casting them erroneously to our structs.
*/
static inline struct intel_buffer_object *
static INLINE struct intel_buffer_object *
intel_buffer_object( struct gl_buffer_object *obj )
{
if (obj->Name)

+ 4
- 4
src/mesa/drivers/dri/i915/intel_context.h Просмотреть файл

@@ -377,7 +377,7 @@ do { \
* XXX Put this in src/mesa/main/imports.h ???
*/
#if defined(i386) || defined(__i386__)
static inline void * __memcpy(void * to, const void * from, size_t n)
static INLINE void * __memcpy(void * to, const void * from, size_t n)
{
int d0, d1, d2;
__asm__ __volatile__(
@@ -523,17 +523,17 @@ extern int intel_translate_logic_op( GLenum opcode );
* Inline conversion functions.
* These are better-typed than the macros used previously:
*/
static inline struct intel_context *intel_context( GLcontext *ctx )
static INLINE struct intel_context *intel_context( GLcontext *ctx )
{
return (struct intel_context *)ctx;
}

static inline struct intel_texture_object *intel_texture_object( struct gl_texture_object *obj )
static INLINE struct intel_texture_object *intel_texture_object( struct gl_texture_object *obj )
{
return (struct intel_texture_object *)obj;
}

static inline struct intel_texture_image *intel_texture_image( struct gl_texture_image *img )
static INLINE struct intel_texture_image *intel_texture_image( struct gl_texture_image *img )
{
return (struct intel_texture_image *)img;
}

Загрузка…
Отмена
Сохранить