diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-24 17:00:29 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-24 17:00:29 +0800 |
| commit | 44fb5156bbda5e4fc1cd810fec5e50ac70ff39cf (patch) | |
| tree | a76a13172f73a97a97632433d3dacd9376778e18 /src/mesa/drivers/x11/xm_api.c | |
| parent | ad76128204d856527e033a83c1b5a35a2f52ba92 (diff) | |
| parent | 8e1c3bd0b4c599bae5b64cd51cec1d74266f30fb (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/drivers/x11/xm_api.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_api.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index b513dc8d40..24b19d8eb5 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -363,7 +363,6 @@ static XMesaBuffer create_xmesa_buffer(XMesaDrawable d, BufferType type, XMesaVisual vis, XMesaColormap cmap) { - GLboolean swAlpha; XMesaBuffer b; ASSERT(type == WINDOW || type == PIXMAP || type == PBUFFER); @@ -421,10 +420,10 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type, /* Visual has alpha, but pixel format doesn't support it. * We'll use an alpha renderbuffer wrapper. */ - swAlpha = GL_TRUE; + b->swAlpha = GL_TRUE; } else { - swAlpha = GL_FALSE; + b->swAlpha = GL_FALSE; } /* @@ -435,9 +434,9 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type, vis->mesa_visual.haveDepthBuffer, vis->mesa_visual.haveStencilBuffer, vis->mesa_visual.haveAccumBuffer, - swAlpha, + b->swAlpha, vis->mesa_visual.numAuxBuffers > 0 ); - + /* insert buffer into linked list */ b->Next = XMesaBufferList; XMesaBufferList = b; @@ -2211,6 +2210,9 @@ void XMesaSwapBuffers( XMesaBuffer b ) ); /*_glthread_UNLOCK_MUTEX(_xmesa_lock);*/ } + + if (b->swAlpha) + _mesa_copy_soft_alpha_renderbuffers(ctx, &b->mesa_buffer); } #if !defined(XFree86Server) XSync( b->xm_visual->display, False ); |