Remove get_buffer_size()

Always check window size in XMesaMakeCurrent() in case glViewport is not
called.

2 files changed, 4 insertions, 15 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),
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index df2fc48e93b..76195e17e47 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -94,15 +94,6 @@ const int xmesa_kernel1[16] = {
 };
 
 
-/** XXX obsolete ***/
-static void
-get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
-{
-   XMesaBuffer b = XMESA_BUFFER(buffer);
-   xmesa_get_window_size(b->display, b, width, height);
-}
-
-
 static void
 finish_or_flush( GLcontext *ctx )
 {
@@ -1176,7 +1167,7 @@ xmesa_init_driver_functions( XMesaVisual xmvisual,
 {
    driver->GetString = get_string;
    driver->UpdateState = xmesa_update_state;
-   driver->GetBufferSize = get_buffer_size;
+   driver->GetBufferSize = NULL; /* OBSOLETE */
    driver->Flush = finish_or_flush;
    driver->Finish = finish_or_flush;
    driver->ClearIndex = clear_index;