fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-11 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove get_buffer_size()

Browse source 
Always check window size in XMesaMakeCurrent() in case glViewport is not
called.
This commit is contained in:
Brian Paul 2006-10-17 17:51:39 +00:00
parent 544b94e156
commit 42b26f688d
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/x11/xm_api.c
View file

@ -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),

11
src/mesa/drivers/x11/xm_dd.c
View file

@ -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;