From f7025b4baa1ba35ee796785641f04eac5bedb0a6 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 5 Oct 2011 17:37:34 +0200 Subject: mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011 --- mesalib/src/mesa/program/program.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mesalib/src/mesa/program/program.h') diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h index 0f32a6af7..9cd1780b8 100644 --- a/mesalib/src/mesa/program/program.h +++ b/mesalib/src/mesa/program/program.h @@ -93,7 +93,7 @@ _mesa_reference_program_(struct gl_context *ctx, struct gl_program **ptr, struct gl_program *prog); -static INLINE void +static inline void _mesa_reference_program(struct gl_context *ctx, struct gl_program **ptr, struct gl_program *prog) @@ -102,7 +102,7 @@ _mesa_reference_program(struct gl_context *ctx, _mesa_reference_program_(ctx, ptr, prog); } -static INLINE void +static inline void _mesa_reference_vertprog(struct gl_context *ctx, struct gl_vertex_program **ptr, struct gl_vertex_program *prog) @@ -111,7 +111,7 @@ _mesa_reference_vertprog(struct gl_context *ctx, (struct gl_program *) prog); } -static INLINE void +static inline void _mesa_reference_fragprog(struct gl_context *ctx, struct gl_fragment_program **ptr, struct gl_fragment_program *prog) @@ -120,7 +120,7 @@ _mesa_reference_fragprog(struct gl_context *ctx, (struct gl_program *) prog); } -static INLINE void +static inline void _mesa_reference_geomprog(struct gl_context *ctx, struct gl_geometry_program **ptr, struct gl_geometry_program *prog) @@ -132,21 +132,21 @@ _mesa_reference_geomprog(struct gl_context *ctx, extern struct gl_program * _mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog); -static INLINE struct gl_vertex_program * +static inline struct gl_vertex_program * _mesa_clone_vertex_program(struct gl_context *ctx, const struct gl_vertex_program *prog) { return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base); } -static INLINE struct gl_geometry_program * +static inline struct gl_geometry_program * _mesa_clone_geometry_program(struct gl_context *ctx, const struct gl_geometry_program *prog) { return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base); } -static INLINE struct gl_fragment_program * +static inline struct gl_fragment_program * _mesa_clone_fragment_program(struct gl_context *ctx, const struct gl_fragment_program *prog) { @@ -185,7 +185,7 @@ _mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog); /* keep these in the same order as TGSI_PROCESSOR_* */ -static INLINE GLuint +static inline GLuint _mesa_program_target_to_index(GLenum v) { switch(v) @@ -202,7 +202,7 @@ _mesa_program_target_to_index(GLenum v) } } -static INLINE GLenum +static inline GLenum _mesa_program_index_to_target(GLuint i) { GLenum enums[MESA_SHADER_TYPES] = { -- cgit v1.2.3