From 8574eba804031f6b19713f0b02952280730bf62e Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 5 Mar 2015 22:17:40 +0100 Subject: fontconfig mesa git update 5 Mar 2015 --- mesalib/src/mesa/drivers/dri/swrast/swrast.c | 5 +++-- mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'mesalib/src/mesa/drivers/dri/swrast') diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 8005f7d69..fb29078b6 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -32,6 +32,7 @@ * The back-buffer is allocated by the driver and is private. */ +#include #include "main/api_exec.h" #include "main/context.h" #include "main/extensions.h" @@ -341,7 +342,7 @@ swrast_delete_renderbuffer(struct gl_context *ctx, struct gl_renderbuffer *rb) } /* see bytes_per_line in libGL */ -static INLINE int +static inline int bytes_per_line(unsigned pitch_bits, unsigned mul) { unsigned mask = mul - 1; @@ -481,7 +482,7 @@ swrast_map_renderbuffer(struct gl_context *ctx, return; } - ASSERT(xrb->Base.Buffer); + assert(xrb->Base.Buffer); if (rb->AllocStorage == swrast_alloc_back_storage) { map += (rb->Height - 1) * stride; diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h index 535f6fe59..1f3a48f38 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h @@ -65,13 +65,13 @@ struct dri_context __DRIcontext *cPriv; }; -static INLINE struct dri_context * +static inline struct dri_context * dri_context(__DRIcontext * driContextPriv) { return (struct dri_context *)driContextPriv->driverPrivate; } -static INLINE struct dri_context * +static inline struct dri_context * swrast_context(struct gl_context *ctx) { return (struct dri_context *) ctx; @@ -89,13 +89,13 @@ struct dri_drawable char *row; }; -static INLINE struct dri_drawable * +static inline struct dri_drawable * dri_drawable(__DRIdrawable * driDrawPriv) { return (struct dri_drawable *)driDrawPriv->driverPrivate; } -static INLINE struct dri_drawable * +static inline struct dri_drawable * swrast_drawable(struct gl_framebuffer *fb) { return (struct dri_drawable *) fb; @@ -115,7 +115,7 @@ struct dri_swrast_renderbuffer { GLuint bpp; }; -static INLINE struct dri_swrast_renderbuffer * +static inline struct dri_swrast_renderbuffer * dri_swrast_renderbuffer(struct gl_renderbuffer *rb) { return (struct dri_swrast_renderbuffer *) rb; -- cgit v1.2.3