mesa: Branch 'master'
Michel Daenzer
daenzer at kemper.freedesktop.org
Mon Mar 19 17:34:51 UTC 2007
src/mesa/drivers/dri/i915tex/intel_buffers.c | 22 ----------------------
src/mesa/drivers/dri/i915tex/intel_context.c | 6 +-----
2 files changed, 1 insertion(+), 27 deletions(-)
New commits:
diff-tree 07db8c9115c0b07d79be778976e25f8eb18d42a2 (from 9b42100c04f14b4f2c1e5fe9748bb0519ed6c516)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Mon Mar 19 18:34:27 2007 +0100
i915tex: The intended triple buffering fix.
Making modifications while the editor spawned by git-commit was suspended
didn't have the intended effect.
diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index c0b4f43..62ff54b 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -349,28 +349,6 @@ intelWindowMoved(struct intel_context *i
/* Update Mesa's notion of window size */
driUpdateFramebufferSize(ctx, dPriv);
-
- /* Update size of third renderbuffer */
- if (intel_fb->pf_num_pages == 3) {
- struct gl_renderbuffer *rb = &intel_fb->color_rb[(intel_fb->pf_current_page
- + 2) % 3]->Base;
-
- /* only resize if size is changing */
- if (rb->Width != intel_fb->Base.Width ||
- rb->Height != intel_fb->Base.Height) {
- /* could just as well pass rb->_ActualFormat here */
- if (rb->AllocStorage(ctx, rb, rb->InternalFormat,
- intel_fb->Base.Width, intel_fb->Base.Height)) {
- ASSERT(rb->Width == intel_fb->Base.Width);
- ASSERT(rb->Height == intel_fb->Base.Height);
- }
- else {
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "Resizing framebuffer");
- /* no return */
- }
- }
- }
-
intel_fb->Base.Initialized = GL_TRUE; /* XXX remove someday */
/* Update hardware scissor */
diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915tex/intel_context.c
index 5c2cdf0..acda7b1 100644
--- a/src/mesa/drivers/dri/i915tex/intel_context.c
+++ b/src/mesa/drivers/dri/i915tex/intel_context.c
@@ -581,11 +581,7 @@ intelMakeCurrent(__DRIcontextPrivate * d
}
/* set GLframebuffer size to match window, if needed */
- if (intel_fb->Base.Width != driDrawPriv->w) {
- _mesa_resize_framebuffer(&intel->ctx, &intel_fb->Base,
- driDrawPriv->w, driDrawPriv->h);
- }
- if (readFb->Width != driReadPriv->w) {
+ if (driReadPriv != driDrawPriv && readFb->Width != driReadPriv->w) {
_mesa_resize_framebuffer(&intel->ctx, readFb,
driReadPriv->w, driReadPriv->h);
}
More information about the mesa-commit
mailing list