diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
| commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
| tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h | |
| parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
| parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
| download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h index d08d42a81..36ab02053 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h @@ -31,6 +31,7 @@ #include <GL/internal/dri_interface.h> #include "main/mtypes.h" #include "dri_util.h" +#include "swrast/s_context.h" #ifdef _MSC_VER #ifdef PUBLIC @@ -107,8 +108,8 @@ swrast_drawable(struct gl_framebuffer *fb) return (struct dri_drawable *) fb; } -struct swrast_renderbuffer { - struct gl_renderbuffer Base; +struct dri_swrast_renderbuffer { + struct swrast_renderbuffer Base; __DRIdrawable *dPriv; /* GL_MAP_*_BIT, used for mapping of front buffer. */ @@ -121,10 +122,10 @@ struct swrast_renderbuffer { GLuint bpp; }; -static INLINE struct swrast_renderbuffer * -swrast_renderbuffer(struct gl_renderbuffer *rb) +static INLINE struct dri_swrast_renderbuffer * +dri_swrast_renderbuffer(struct gl_renderbuffer *rb) { - return (struct swrast_renderbuffer *) rb; + return (struct dri_swrast_renderbuffer *) rb; } @@ -137,14 +138,4 @@ swrast_renderbuffer(struct gl_renderbuffer *rb) #define PF_X8R8G8B8 4 /**< 32bpp TrueColor: 8-R, 8-G, 8-B bits */ -/* swrast_span.c */ - -extern void -swrast_set_span_funcs_back(struct swrast_renderbuffer *xrb, - GLuint pixel_format); - -extern void -swrast_set_span_funcs_front(struct swrast_renderbuffer *xrb, - GLuint pixel_format); - #endif /* _SWRAST_PRIV_H_ */ |