mesa: Branch 'master' - 4 commits

[Brian Paul]

 progs/demos/winpos.c             |    2 +-
 src/mesa/drivers/x11/xm_buffer.c |    3 +--
 src/mesa/main/framebuffer.c      |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 38a88db1fc69b774ded3b7a44126e0b0f61e886b (from parents)
Merge: 9f37be694ed5fc14d783559055443d4042c73393 afa780c09d8e48c1c9ecaa4bce1bbe7e8e9c5e2c
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Feb 28 11:58:30 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree 9f37be694ed5fc14d783559055443d4042c73393 (from 59e56ee3e5c8f9aa9ec74e1817065a7ae14012ea)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Feb 28 11:58:06 2007 -0700

    s/ARB/MESA/ in extension check (bug 10126)

diff --git a/progs/demos/winpos.c b/progs/demos/winpos.c
index 2ee1df6..3a1a19e 100644
--- a/progs/demos/winpos.c
+++ b/progs/demos/winpos.c
@@ -77,7 +77,7 @@ static void init( void )
       WindowPosFunc = &glWindowPos2fARB;
    }
    else
-#elif defined(GL_ARB_window_pos)
+#elif defined(GL_MESA_window_pos)
    if (glutExtensionSupported("GL_MESA_window_pos")) {
       printf("Using GL_MESA_window_pos\n");
       WindowPosFunc = &glWindowPos2fMESA;
diff-tree 59e56ee3e5c8f9aa9ec74e1817065a7ae14012ea (from f30e31276304696558abffdd9a6e3df21d41c0f5)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Feb 27 11:09:48 2007 -0700

    fix comment

diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 187ae51..a358ec2 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -355,8 +355,7 @@ xmesa_new_renderbuffer(GLcontext *ctx, G
 
 /**
  * Called via gl_framebuffer::Delete() method when this buffer
- * is _really_ being
- * deleted.
+ * is _really_ being deleted.
  */
 void
 xmesa_delete_framebuffer(struct gl_framebuffer *fb)
diff-tree f30e31276304696558abffdd9a6e3df21d41c0f5 (from e21096b07c5854d01114b58f87d08709e370f8b7)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Feb 27 11:09:28 2007 -0700

    assert that fb->RefCount==0 in _mesa_free_framebuffer_data()

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index d061d22..3fe70f4 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -216,6 +216,7 @@ _mesa_free_framebuffer_data(struct gl_fr
    GLuint i;
 
    assert(fb);
+   assert(fb->RefCount == 0);
 
    _glthread_DESTROY_MUTEX(fb->Mutex);