Module: Mesa Branch: master Commit: d7165b383da018ff666f789d555093fa3164dc73 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7165b383da018ff666f789d555093fa3164dc73
Author: Eric Anholt <[email protected]> Date: Thu Jun 20 09:41:10 2013 -0700 mesa: Remove the Initialized field from framebuffers. This existed to tell the core not to call GetBufferSize, except that even if you didn't set it nothing happened because nobody had a GetBufferSize. v2: Remove two more instances of setting the field (from Brian) Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/drivers/dri/intel/intel_fbo.c | 2 -- src/mesa/drivers/dri/radeon/radeon_common.c | 2 -- src/mesa/drivers/dri/radeon/radeon_fbo.c | 2 -- src/mesa/drivers/osmesa/osmesa.c | 1 - src/mesa/drivers/x11/xm_api.c | 1 - src/mesa/main/mtypes.h | 2 -- src/mesa/state_tracker/st_manager.c | 2 -- 7 files changed, 0 insertions(+), 12 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index 5fe3dc7..32d1797 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -339,8 +339,6 @@ intel_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, _mesa_resize_framebuffer(ctx, fb, width, height); - fb->Initialized = true; /* XXX remove someday */ - if (_mesa_is_user_fbo(fb)) { return; } diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 0cf656b..0f0945d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -85,7 +85,6 @@ void radeonSetCliprects(radeonContextPtr radeon) (draw_rfb->base.Height != drawable->h)) { _mesa_resize_framebuffer(&radeon->glCtx, &draw_rfb->base, drawable->w, drawable->h); - draw_rfb->base.Initialized = GL_TRUE; } if (drawable != readable) { @@ -93,7 +92,6 @@ void radeonSetCliprects(radeonContextPtr radeon) (read_rfb->base.Height != readable->h)) { _mesa_resize_framebuffer(&radeon->glCtx, &read_rfb->base, readable->w, readable->h); - read_rfb->base.Initialized = GL_TRUE; } } diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index 63bc7e8..29a6d79 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -635,8 +635,6 @@ radeon_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, _mesa_resize_framebuffer(ctx, fb, width, height); - fb->Initialized = GL_TRUE; /* XXX remove someday */ - if (fb->Name != 0) { return; } diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 241e74f..deb0b93 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -916,7 +916,6 @@ OSMesaMakeCurrent( OSMesaContext osmesa, void *buffer, GLenum type, * osmesa_renderbuffer_storage() function to get called. */ _mesa_resize_framebuffer(&osmesa->mesa, osmesa->gl_buffer, width, height); - osmesa->gl_buffer->Initialized = GL_TRUE; /* XXX TEMPORARY? */ _mesa_make_current( &osmesa->mesa, osmesa->gl_buffer, osmesa->gl_buffer ); diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 6455889..b7c94aa 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -1193,7 +1193,6 @@ xmesa_check_and_update_buffer_size(XMesaContext xmctx, XMesaBuffer drawBuffer) struct gl_context *ctx = xmctx ? &xmctx->mesa : NULL; _mesa_resize_framebuffer(ctx, &(drawBuffer->mesa_buffer), width, height); } - drawBuffer->mesa_buffer.Initialized = GL_TRUE; /* XXX TEMPORARY? */ } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0002da5..5d5b534 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2680,8 +2680,6 @@ struct gl_framebuffer */ struct gl_config Visual; - GLboolean Initialized; - GLuint Width, Height; /**< size of frame buffer in pixels */ /** \name Drawing bounds (Intersection of buffer size and scissor box) */ diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index ec87608..9c2b4d2 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -431,8 +431,6 @@ st_framebuffer_create(struct st_framebuffer_iface *stfbi) stfb->stamp = 0; st_framebuffer_update_attachments(stfb); - stfb->Base.Initialized = GL_TRUE; - return stfb; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
