diff options
| author | Brian Paul <[email protected]> | 2002-10-14 17:08:17 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-10-14 17:08:17 +0000 |
| commit | 60b6e4fd7e85ca0ad1c4ab22433b745bf97e9280 (patch) | |
| tree | 5368e3158654b0d3d52a828ea517909635b5e267 /src/mesa/drivers/x11 | |
| parent | 795ae30787e6fd9413a495586edf4973e4987417 (diff) | |
context-related cleanups (ex: _mesa_notifySwapBuffers instead of _mesa_swapbuffers)
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/xm_api.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 28837db6ca4..c4463af6901 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -1,4 +1,4 @@ -/* $Id: xm_api.c,v 1.44 2002/10/09 19:35:11 brianp Exp $ */ +/* $Id: xm_api.c,v 1.45 2002/10/14 17:08:34 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1642,6 +1642,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) _mesa_enable_sw_extensions(ctx); _mesa_enable_1_3_extensions(ctx); + /*_mesa_enable_1_4_extensions(ctx);*/ if (CHECK_BYTE_ORDER(v)) { c->swapbytes = GL_FALSE; @@ -2329,7 +2330,7 @@ void XMesaSwapBuffers( XMesaBuffer b ) * we have to flush any pending rendering commands first. */ if (ctx && ctx->DrawBuffer == &(b->mesa_buffer)) - _mesa_swapbuffers(ctx); + _mesa_notifySwapBuffers(ctx); if (b->db_state) { #ifdef FX @@ -2395,7 +2396,7 @@ void XMesaCopySubBuffer( XMesaBuffer b, int x, int y, int width, int height ) * we have to flush any pending rendering commands first. */ if (ctx && ctx->DrawBuffer == &(b->mesa_buffer)) - _mesa_swapbuffers(ctx); + _mesa_notifySwapBuffers(ctx); if (b->db_state) { int yTop = b->height - y - height; diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 81a4b006a46..e0bc2be1d4c 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -1,4 +1,4 @@ -/* $Id: xm_dd.c,v 1.38 2002/10/11 17:41:06 brianp Exp $ */ +/* $Id: xm_dd.c,v 1.39 2002/10/14 17:08:38 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -146,7 +146,7 @@ set_buffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit ) ASSERT(target->db_state); if (target->backpixmap) { /* back buffer is a pixmape */ - target->buffer = target->backpixmap; + target->buffer = target->backpixmap; /* incompatible types? */ } else if (target->backimage) { /* back buffer is an XImage */ |