fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-05 08:20:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

dri/swrast: rename swrast_renderbuffer to dri_swrast_renderbuffer

Browse source 
To prevent name collision with future swrast_renderbuffer in the swrast
module.
This commit is contained in:
Brian Paul 2012-01-16 12:29:04 -07:00
parent c45771905f
commit 1048d55d5f
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/drivers/dri/swrast/swrast.c
View file

@ -282,7 +282,7 @@ static GLboolean
swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLuint width, GLuint height)
{
struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
struct dri_swrast_renderbuffer *xrb = dri_swrast_renderbuffer(rb);
TRACE;
@ -301,7 +301,7 @@ static GLboolean
swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
GLenum internalFormat, GLuint width, GLuint height)
{
struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
struct dri_swrast_renderbuffer *xrb = dri_swrast_renderbuffer(rb);
TRACE;
@ -314,11 +314,11 @@ swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
return GL_TRUE;
}
static struct swrast_renderbuffer *
static struct dri_swrast_renderbuffer *
swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv,
GLboolean front)
{
struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
struct dri_swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
GLuint pixel_format;
TRACE;
@ -379,7 +379,7 @@ swrast_map_renderbuffer(struct gl_context *ctx,
GLubyte **out_map,
GLint *out_stride)
{
struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
struct dri_swrast_renderbuffer *xrb = dri_swrast_renderbuffer(rb);
GLubyte *map = rb->Buffer;
int cpp = _mesa_get_format_bytes(rb->Format);
int stride = rb->Width * cpp;
@ -424,7 +424,7 @@ static void
swrast_unmap_renderbuffer(struct gl_context *ctx,
struct gl_renderbuffer *rb)
{
struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb);
struct dri_swrast_renderbuffer *xrb = dri_swrast_renderbuffer(rb);
if (rb->AllocStorage == swrast_alloc_front_storage) {
__DRIdrawable *dPriv = xrb->dPriv;
@ -450,7 +450,7 @@ dri_create_buffer(__DRIscreen * sPriv,
{
struct dri_drawable *drawable = NULL;
struct gl_framebuffer *fb;
struct swrast_renderbuffer *frontrb, *backrb;
struct dri_swrast_renderbuffer *frontrb, *backrb;
TRACE;
@ -531,16 +531,16 @@ dri_swap_buffers(__DRIdrawable * dPriv)
struct dri_drawable *drawable = dri_drawable(dPriv);
struct gl_framebuffer *fb;
struct swrast_renderbuffer *frontrb, *backrb;
struct dri_swrast_renderbuffer *frontrb, *backrb;
TRACE;
fb = &drawable->Base;
frontrb =
swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
dri_swrast_renderbuffer(fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
backrb =
swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
dri_swrast_renderbuffer(fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer);
/* check for signle-buffered */
if (backrb == NULL)

8
src/mesa/drivers/dri/swrast/swrast_priv.h
View file

@ -100,7 +100,7 @@ swrast_drawable(struct gl_framebuffer *fb)
return (struct dri_drawable *) fb;
}
struct swrast_renderbuffer {
struct dri_swrast_renderbuffer {
struct gl_renderbuffer Base;
__DRIdrawable *dPriv;
@ -114,10 +114,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;
}