diff options
| author | Brian Paul <[email protected]> | 2012-01-16 12:28:42 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-01-24 14:12:27 -0700 |
| commit | 59a5b5a193d5d9c5776aa586b34657b6e315479d (patch) | |
| tree | 405a0a59ae57f9b68de416ce69dcb4f5928bc29e /src/mesa/drivers/x11/xm_dd.c | |
| parent | ab331140c68d1c157e69ea8e53b44729355fa43c (diff) | |
mesa: remove gl_renderbuffer::Wrapped
There's no such thing as renderbuffer wrappers anymore.
Diffstat (limited to 'src/mesa/drivers/x11/xm_dd.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 9ab77e2a631..b1439d8d594 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -329,7 +329,7 @@ can_do_DrawPixels_8R8G8B(struct gl_context *ctx, GLenum format, GLenum type) if ((swrast->_RasterMask & ~CLIP_BIT) == 0) /* no blend, z-test, etc */ { struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; if (rb) { - struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb->Wrapped); + struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb); if (xrb && xrb->pixmap && /* drawing to pixmap or window */ _mesa_get_format_bits(xrb->Base.Format, GL_ALPHA_BITS) == 0) { @@ -393,7 +393,7 @@ xmesa_DrawPixels_8R8G8B( struct gl_context *ctx, XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer); const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ struct xmesa_renderbuffer *xrb - = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); + = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]); const int srcX = clippedUnpack.SkipPixels; const int srcY = clippedUnpack.SkipRows; const int rowLength = clippedUnpack.RowLength; @@ -462,7 +462,7 @@ can_do_DrawPixels_5R6G5B(struct gl_context *ctx, GLenum format, GLenum type) if ((swrast->_RasterMask & ~CLIP_BIT) == 0) /* no blend, z-test, etc */ { struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; if (rb) { - struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb->Wrapped); + struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb); if (xrb && xrb->pixmap && /* drawing to pixmap or window */ _mesa_get_format_bits(xrb->Base.Format, GL_ALPHA_BITS) == 0) { @@ -527,7 +527,7 @@ xmesa_DrawPixels_5R6G5B( struct gl_context *ctx, XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer); const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ struct xmesa_renderbuffer *xrb - = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); + = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]); const int srcX = clippedUnpack.SkipPixels; const int srcY = clippedUnpack.SkipRows; const int rowLength = clippedUnpack.RowLength; @@ -597,9 +597,9 @@ can_do_CopyPixels(struct gl_context *ctx, GLenum type) ctx->DrawBuffer && ctx->DrawBuffer->_ColorDrawBuffers[0]) { struct xmesa_renderbuffer *srcXrb - = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer->Wrapped); + = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer); struct xmesa_renderbuffer *dstXrb - = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); + = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]); if (srcXrb->pixmap && dstXrb->pixmap) { return GL_TRUE; } @@ -625,9 +625,9 @@ xmesa_CopyPixels( struct gl_context *ctx, XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer); const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ struct xmesa_renderbuffer *srcXrb - = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer->Wrapped); + = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer); struct xmesa_renderbuffer *dstXrb - = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); + = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]); ASSERT(dpy); ASSERT(gc); |