simplify the window moved/resized code a bit

This commit is contained in:
Brian 2007-11-03 10:26:19 -06:00
parent ed8774e920
commit cb62b64e33
2 changed files with 12 additions and 3 deletions

View file

@ -221,11 +221,13 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
st_make_current(intel->st, draw_fb, read_fb);
#if 0
/* update size of Mesa framebuffer(s) to match window */
st_resize_framebuffer(draw_fb, driDrawPriv->w, driDrawPriv->h);
if (driReadPriv != driDrawPriv) {
st_resize_framebuffer(read_fb, driReadPriv->w, driReadPriv->h);
}
#endif
if ((intel->driDrawable != driDrawPriv) ||
(intel->lastStamp != driDrawPriv->lastStamp)) {
@ -233,6 +235,16 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
intelWindowMoved(intel);
intel->lastStamp = driDrawPriv->lastStamp;
}
#if 1
/* The size of the draw buffer will have been updated above.
* If the readbuffer is a different window, check/update its size now.
*/
if (driReadPriv != driDrawPriv) {
st_resize_framebuffer(read_fb, driReadPriv->w, driReadPriv->h);
}
#endif
}
else {
st_make_current(NULL, NULL, NULL);

View file

@ -243,13 +243,10 @@ void
intelWindowMoved(struct intel_context *intel)
{
__DRIdrawablePrivate *dPriv = intel->driDrawable;
struct intel_framebuffer *intel_fb = dPriv->driverPrivate;
struct st_framebuffer *stfb
= (struct st_framebuffer *) dPriv->driverPrivate;
st_resize_framebuffer(stfb, dPriv->w, dPriv->h);
intel_fb->Base.Initialized = GL_TRUE; /* XXX remove someday */
}