diff options
| author | Brian Paul <[email protected]> | 2011-11-12 11:50:31 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-11-15 07:49:25 -0700 |
| commit | c9bfad2921904780d982917def276a6979a5debd (patch) | |
| tree | 5f9378fcf17ddf31f0b006052e20e1382dbcc92f /src/mesa | |
| parent | dff2394e08651304d924ef9df796ff0ac6b844c3 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/x11/xm_buffer.c | 13 |
1 files changed, 1 insertions, 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 */ |