summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11/xm_api.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-10-17 17:51:39 +0000
committerBrian Paul <[email protected]>2006-10-17 17:51:39 +0000
commit42b26f688d82b2023ea882bfa1fd13bb6548d73a (patch)
treeee2e60f3beac0fb1d3c318267373d47deea9e747 /src/mesa/drivers/x11/xm_api.c
parent544b94e15617fb69f77ebd57b1be49aafe2f64e6 (diff)
Remove get_buffer_size()
Always check window size in XMesaMakeCurrent() in case glViewport is not called.
Diffstat (limited to 'src/mesa/drivers/x11/xm_api.c')
-rw-r--r--src/mesa/drivers/x11/xm_api.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 6aa8dc5d7d3..b50c4757afc 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1890,7 +1890,7 @@ xmesa_check_and_update_buffer_size(XMesaContext xmctx, XMesaBuffer drawBuffer)
_mesa_resize_framebuffer(&(xmctx->mesa),
&(drawBuffer->mesa_buffer), width, height);
}
- drawBuffer->mesa_buffer.Initialized = GL_TRUE;
+ drawBuffer->mesa_buffer.Initialized = GL_TRUE; /* XXX TEMPORARY? */
}
@@ -1937,10 +1937,8 @@ GLboolean XMesaMakeCurrent2( XMesaContext c, XMesaBuffer drawBuffer,
*/
_glapi_check_multithread();
- if (!drawBuffer->mesa_buffer.Initialized)
- xmesa_check_and_update_buffer_size(c, drawBuffer);
-
- if (!readBuffer->mesa_buffer.Initialized)
+ xmesa_check_and_update_buffer_size(c, drawBuffer);
+ if (readBuffer != drawBuffer)
xmesa_check_and_update_buffer_size(c, readBuffer);
_mesa_make_current(&(c->mesa),