From c9bfad2921904780d982917def276a6979a5debd Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 12 Nov 2011 11:50:31 -0700 Subject: [PATCH] xlib: use MESA_FORMAT_XRGB8888 for pixmap surfaces We no longer have software-allocated alpha buffers so we can forget about the alpha channel. Reviewed-by: Eric Anholt --- src/mesa/drivers/x11/xm_buffer.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c index ea87b6dfd0a..cd059fc09d9 100644 --- a/src/mesa/drivers/x11/xm_buffer.c +++ b/src/mesa/drivers/x11/xm_buffer.c @@ -349,7 +349,7 @@ xmesa_new_renderbuffer(struct gl_context *ctx, GLuint name, /* This will really only happen for pixmaps. We'll access the * pixmap via a temporary XImage which will be 32bpp. */ - xrb->Base.Format = MESA_FORMAT_ARGB8888; + xrb->Base.Format = MESA_FORMAT_XRGB8888; break; case PF_8A8R8G8B: xrb->Base.Format = MESA_FORMAT_ARGB8888; @@ -477,17 +477,6 @@ xmesa_MapRenderbuffer(struct gl_context *ctx, return; } - if (xrb->Base.Format == MESA_FORMAT_ARGB8888 || - xrb->Base.Format == MESA_FORMAT_RGBA8888_REV) { - /* The original pixmap is RGB but we're returning an RGBA - * image buffer. Fill in the A values with 0xff. - */ - GLuint i, *p = (GLuint *) ximage->data; - for (i = 0; i < w * h; i++) { - p[i] |= 0xff000000; - } - } - xrb->map_ximage = ximage; /* the first row of the OpenGL image is last row of the XImage */ -- 2.30.2