OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove gl_renderbuffer::Wrapped

Browse Source 
There's no such thing as renderbuffer wrappers anymore.
This commit is contained in:
Brian Paul
2012-01-16 12:28:42 -07:00
parent ab331140c6
commit 59a5b5a193
7 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/nouveau/nouveau_driver.c
View File

@@ -96,7 +96,7 @@ nouveau_clear(struct gl_context *ctx, GLbitfield buffers)
continue; continue;
s = &to_nouveau_renderbuffer( s = &to_nouveau_renderbuffer(
fb->Attachment[i].Renderbuffer->Wrapped)->surface; fb->Attachment[i].Renderbuffer)->surface;
if (buf & BUFFER_BITS_COLOR) { if (buf & BUFFER_BITS_COLOR) {
mask = pack_rgba_i(s->format, ctx->Color.ColorMask[0]); mask = pack_rgba_i(s->format, ctx->Color.ColorMask[0]);

16
src/mesa/drivers/x11/xm_dd.c
View File

@@ -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 */ { if ((swrast->_RasterMask & ~CLIP_BIT) == 0) /* no blend, z-test, etc */ {
struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];
if (rb) { if (rb) {
struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb->Wrapped); struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb);
if (xrb && if (xrb &&
xrb->pixmap && /* drawing to pixmap or window */ xrb->pixmap && /* drawing to pixmap or window */
_mesa_get_format_bits(xrb->Base.Format, GL_ALPHA_BITS) == 0) { _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); XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */
struct xmesa_renderbuffer *xrb struct xmesa_renderbuffer *xrb
= xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
const int srcX = clippedUnpack.SkipPixels; const int srcX = clippedUnpack.SkipPixels;
const int srcY = clippedUnpack.SkipRows; const int srcY = clippedUnpack.SkipRows;
const int rowLength = clippedUnpack.RowLength; 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 */ { if ((swrast->_RasterMask & ~CLIP_BIT) == 0) /* no blend, z-test, etc */ {
struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0]; struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0];
if (rb) { if (rb) {
struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb->Wrapped); struct xmesa_renderbuffer *xrb = xmesa_renderbuffer(rb);
if (xrb && if (xrb &&
xrb->pixmap && /* drawing to pixmap or window */ xrb->pixmap && /* drawing to pixmap or window */
_mesa_get_format_bits(xrb->Base.Format, GL_ALPHA_BITS) == 0) { _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); XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */
struct xmesa_renderbuffer *xrb struct xmesa_renderbuffer *xrb
= xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
const int srcX = clippedUnpack.SkipPixels; const int srcX = clippedUnpack.SkipPixels;
const int srcY = clippedUnpack.SkipRows; const int srcY = clippedUnpack.SkipRows;
const int rowLength = clippedUnpack.RowLength; const int rowLength = clippedUnpack.RowLength;
@@ -597,9 +597,9 @@ can_do_CopyPixels(struct gl_context *ctx, GLenum type)
ctx->DrawBuffer && ctx->DrawBuffer &&
ctx->DrawBuffer->_ColorDrawBuffers[0]) { ctx->DrawBuffer->_ColorDrawBuffers[0]) {
struct xmesa_renderbuffer *srcXrb struct xmesa_renderbuffer *srcXrb
= xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer->Wrapped); = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer);
struct xmesa_renderbuffer *dstXrb struct xmesa_renderbuffer *dstXrb
= xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
if (srcXrb->pixmap && dstXrb->pixmap) { if (srcXrb->pixmap && dstXrb->pixmap) {
return GL_TRUE; return GL_TRUE;
} }
@@ -625,9 +625,9 @@ xmesa_CopyPixels( struct gl_context *ctx,
XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer); XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */ const XMesaGC gc = xmbuf->cleargc; /* effected by glColorMask */
struct xmesa_renderbuffer *srcXrb struct xmesa_renderbuffer *srcXrb
= xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer->Wrapped); = xmesa_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer);
struct xmesa_renderbuffer *dstXrb struct xmesa_renderbuffer *dstXrb
= xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
ASSERT(dpy); ASSERT(dpy);
ASSERT(gc); ASSERT(gc);

4
src/mesa/drivers/x11/xm_line.c
View File

@@ -120,7 +120,7 @@ void xmesa_choose_point( struct gl_context *ctx )
#define GET_XRB(XRB) struct xmesa_renderbuffer *XRB = \ #define GET_XRB(XRB) struct xmesa_renderbuffer *XRB = \
xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped) xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0])
/* /*
@@ -461,7 +461,7 @@ get_line_func(struct gl_context *ctx)
if (ctx->Line.StippleFlag) return (swrast_line_func) NULL; if (ctx->Line.StippleFlag) return (swrast_line_func) NULL;
if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_line_func) NULL; if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_line_func) NULL;
xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
if (xrb->ximage if (xrb->ximage
&& swrast->_RasterMask==DEPTH_BIT && swrast->_RasterMask==DEPTH_BIT

4
src/mesa/drivers/x11/xm_tri.c
View File

@@ -43,7 +43,7 @@
#define GET_XRB(XRB) struct xmesa_renderbuffer *XRB = \ #define GET_XRB(XRB) struct xmesa_renderbuffer *XRB = \
xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped) xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0])
/**********************************************************************/ /**********************************************************************/
@@ -1023,7 +1023,7 @@ get_triangle_func(struct gl_context *ctx)
ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
return (swrast_tri_func) NULL; return (swrast_tri_func) NULL;
xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped); xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]);
if (xrb->ximage) { if (xrb->ximage) {
if ( ctx->Light.ShadeModel==GL_SMOOTH if ( ctx->Light.ShadeModel==GL_SMOOTH

3
src/mesa/main/mtypes.h
View File

@@ -2565,9 +2565,6 @@ struct gl_renderbuffer
GLubyte *Map; GLubyte *Map;
GLint RowStrideBytes; GLint RowStrideBytes;
/* Used to wrap one renderbuffer around another: */
struct gl_renderbuffer *Wrapped;
/* Delete this renderbuffer */ /* Delete this renderbuffer */
void (*Delete)(struct gl_renderbuffer *rb); void (*Delete)(struct gl_renderbuffer *rb);

5
src/mesa/main/renderbuffer.c
View File

@@ -54,11 +54,6 @@ _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
rb->Height = 0; rb->Height = 0;
rb->InternalFormat = GL_RGBA; rb->InternalFormat = GL_RGBA;
rb->Format = MESA_FORMAT_NONE; rb->Format = MESA_FORMAT_NONE;
/* Point back to ourself so that we don't have to check for Wrapped==NULL
* all over the drivers.
*/
rb->Wrapped = rb;
} }

2
src/mesa/state_tracker/st_atom_framebuffer.c
View File

@@ -139,7 +139,6 @@ update_framebuffer_state( struct st_context *st )
*/ */
strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer); strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
if (strb) { if (strb) {
strb = st_renderbuffer(strb->Base.Wrapped);
if (strb->rtt) { if (strb->rtt) {
/* rendering to a GL texture, may have to update surface */ /* rendering to a GL texture, may have to update surface */
update_renderbuffer_surface(st, strb); update_renderbuffer_surface(st, strb);
@@ -149,7 +148,6 @@ update_framebuffer_state( struct st_context *st )
else { else {
strb = st_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer); strb = st_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer);
if (strb) { if (strb) {
strb = st_renderbuffer(strb->Base.Wrapped);
assert(strb->surface); assert(strb->surface);
pipe_surface_reference(&framebuffer->zsbuf, strb->surface); pipe_surface_reference(&framebuffer->zsbuf, strb->surface);
} }