context-related cleanups (ex: _mesa_notifySwapBuffers instead of _mesa_swapbuffers)

8 files changed, 16 insertions, 14 deletions

diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index ac21e8a15f3..65c82da19a9 100644
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -936,6 +936,6 @@ void DMesaSwapBuffers (DMesaBuffer b)
 {

  /* copy/swap back buffer to front if applicable */

  GET_CURRENT_CONTEXT(ctx);

- _mesa_swapbuffers(ctx);

+ _mesa_notifySwapBuffers(ctx);

  vl_flip(b->the_window, b->stride, b->height);

 }

diff --git a/src/mesa/drivers/ggi/ggimesa.c b/src/mesa/drivers/ggi/ggimesa.c
index b3afe6ef6c0..73f6f95b669 100644
--- a/src/mesa/drivers/ggi/ggimesa.c
+++ b/src/mesa/drivers/ggi/ggimesa.c
@@ -554,7 +554,7 @@ void ggiMesaSwapBuffers(void)
 	
 	GGIMESADPRINT_CORE("ggiMesaSwapBuffers() called\n");	
 	
-	_mesa_swapbuffers(ctx);
+	_mesa_notifySwapBuffers(ctx);
 	gl_ggiFlush(ctx);
 
 	ggiSetDisplayFrame(ggi_ctx->ggi_visual,
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 5ba01b66e7c..eb87837c9b6 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -1,4 +1,4 @@
-/* $Id: fxapi.c,v 1.33 2002/06/15 02:38:16 brianp Exp $ */
+/* $Id: fxapi.c,v 1.34 2002/10/14 17:08:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -742,7 +742,7 @@ fxMesaSwapBuffers(void)
    }
 
    if (fxMesaCurrentCtx) {
-      _mesa_swapbuffers(fxMesaCurrentCtx->glCtx);
+      _mesa_notifySwapBuffers(fxMesaCurrentCtx->glCtx);
 
       if (fxMesaCurrentCtx->haveDoubleBuffer) {
 
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 5c1f7691c93..ff966c3f037 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.90 2002/10/11 17:41:05 brianp Exp $ */
+/* $Id: osmesa.c,v 1.91 2002/10/14 17:08:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -305,6 +305,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
 
       _mesa_enable_sw_extensions(&(osmesa->gl_ctx));
       _mesa_enable_1_3_extensions(&(osmesa->gl_ctx));
+      /*_mesa_enable_1_4_extensions(&(osmesa->gl_ctx));*/
 
       osmesa->gl_buffer = _mesa_create_framebuffer( osmesa->gl_visual,
                            (GLboolean) ( osmesa->gl_visual->depthBits > 0 ),
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c
index 270455ee691..4581517678b 100644
--- a/src/mesa/drivers/svga/svgamesa.c
+++ b/src/mesa/drivers/svga/svgamesa.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa.c,v 1.20 2002/07/09 01:22:51 brianp Exp $ */
+/* $Id: svgamesa.c,v 1.21 2002/10/14 17:08:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -482,7 +482,7 @@ void SVGAMesaSwapBuffers( void )
    copy_buffer(SVGABuffer.BackBuffer);
 
 #ifndef DEV
-   _mesa_swapbuffers( SVGAMesa->gl_ctx );
+   _mesa_notifySwapBuffers( SVGAMesa->gl_ctx );
    if (SVGAMesa->gl_vis->doubleBufferMode)
 #endif /* DEV */
    {
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index bd91040221b..b18fe548ba7 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.39 2002/10/11 17:41:05 brianp Exp $ */
+/* $Id: wmesa.c,v 1.40 2002/10/14 17:08:28 brianp Exp $ */
 
 /*
  * Windows (Win32) device driver for Mesa 3.4
@@ -1459,7 +1459,7 @@ void WMesaSwapBuffers( void )
    * we have to flush any pending rendering commands first.
    */
   if (Current && Current->gl_ctx == ctx)
-    _mesa_swapbuffers(ctx);
+    _mesa_notifySwapBuffers(ctx);
   
   if (Current->db_flag)
     wmFlush(Current);
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 */