diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /mesalib/src/mesa/main/dlist.c | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'mesalib/src/mesa/main/dlist.c')
| -rw-r--r-- | mesalib/src/mesa/main/dlist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index f11dae9d0..343feec6f 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -560,7 +560,7 @@ make_list(GLuint name, GLuint count) /** * Lookup function to just encapsulate casting. */ -static INLINE struct gl_display_list * +static inline struct gl_display_list * lookup_list(struct gl_context *ctx, GLuint list) { return (struct gl_display_list *) @@ -569,7 +569,7 @@ lookup_list(struct gl_context *ctx, GLuint list) /** Is the given opcode an extension code? */ -static INLINE GLboolean +static inline GLboolean is_ext_opcode(OpCode opcode) { return (opcode >= OPCODE_EXT_0); @@ -1043,7 +1043,7 @@ _mesa_dlist_alloc_opcode(struct gl_context *ctx, * \param nparams number of function parameters * \return pointer to start of instruction space */ -static INLINE Node * +static inline Node * alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams) { return dlist_alloc(ctx, opcode, nparams * sizeof(Node)); @@ -5672,7 +5672,7 @@ save_EdgeFlag(GLboolean x) save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0); } -static INLINE GLboolean compare4fv( const GLfloat *a, +static inline GLboolean compare4fv( const GLfloat *a, const GLfloat *b, GLuint count ) { |