Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/main/context.c
	mesalib/src/mesa/main/fbobject.c

4 files changed, 131 insertions, 94 deletions

diff --git a/mesalib/src/mesa/main/buffers.c b/mesalib/src/mesa/main/buffers.c
index 63f53e2b0..a75c9c2e7 100644
--- a/mesalib/src/mesa/main/buffers.c
+++ b/mesalib/src/mesa/main/buffers.c
@@ -462,6 +462,27 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
 
 
 /**
+ * Update the current drawbuffer's _ColorDrawBufferIndex[] list, etc.
+ * from the context's Color.DrawBuffer[] state.
+ * Use when changing contexts.
+ */
+void
+_mesa_update_draw_buffers(struct gl_context *ctx)
+{
+   GLenum buffers[MAX_DRAW_BUFFERS];
+   GLuint i;
+
+   /* should be a window system FBO */
+   assert(ctx->DrawBuffer->Name == 0);
+
+   for (i = 0; i < ctx->Const.MaxDrawBuffers; i++)
+      buffers[i] = ctx->Color.DrawBuffer[i];
+
+   _mesa_drawbuffers(ctx, ctx->Const.MaxDrawBuffers, buffers, NULL);
+}
+
+
+/**
  * Like \sa _mesa_drawbuffers(), this is a helper function for setting
  * GL_READ_BUFFER state in the context and current FBO.
  * \param ctx  the rendering context
diff --git a/mesalib/src/mesa/main/buffers.h b/mesalib/src/mesa/main/buffers.h
index cf684c5fe..8083bc3d3 100644
--- a/mesalib/src/mesa/main/buffers.h
+++ b/mesalib/src/mesa/main/buffers.h
@@ -1,57 +1,61 @@
-/**

- * \file buffers.h

- * Frame buffer management functions declarations.

- */

-

-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-

-#ifndef BUFFERS_H

-#define BUFFERS_H

-

-

-#include "glheader.h"

-

-struct gl_context;

-

-extern void GLAPIENTRY

-_mesa_DrawBuffer( GLenum mode );

-

-extern void GLAPIENTRY

-_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);

-

-extern void

-_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,

-                  const GLbitfield *destMask);

-

-extern void

-_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex);

-

-extern void GLAPIENTRY

-_mesa_ReadBuffer( GLenum mode );

-

-

-#endif

+/**
+ * \file buffers.h
+ * Frame buffer management functions declarations.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+
+#ifndef BUFFERS_H
+#define BUFFERS_H
+
+
+#include "glheader.h"
+
+struct gl_context;
+
+extern void GLAPIENTRY
+_mesa_DrawBuffer( GLenum mode );
+
+extern void GLAPIENTRY
+_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
+
+extern void
+_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
+                  const GLbitfield *destMask);
+
+extern void
+_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex);
+
+extern void
+_mesa_update_draw_buffers(struct gl_context *ctx);
+
+
+extern void GLAPIENTRY
+_mesa_ReadBuffer( GLenum mode );
+
+
+#endif
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 22959c69e..5e56f4fce 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -1430,7 +1430,8 @@ _mesa_make_current( struct gl_context *newCtx,
    }

 

    if (curCtx && 

-      (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && /* make sure this context is valid for flushing */

+      (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) &&

+       /* make sure this context is valid for flushing */

       curCtx != newCtx)

       _mesa_flush(curCtx);

 

@@ -1445,8 +1446,6 @@ _mesa_make_current( struct gl_context *newCtx,
       _glapi_set_dispatch(newCtx->CurrentDispatch);

 

       if (drawBuffer && readBuffer) {

-	 /* TODO: check if newCtx and buffer's visual match??? */

-

          ASSERT(drawBuffer->Name == 0);

          ASSERT(readBuffer->Name == 0);

          _mesa_reference_framebuffer(&newCtx->WinSysDrawBuffer, drawBuffer);

@@ -1457,23 +1456,12 @@ _mesa_make_current( struct gl_context *newCtx,
           * or not bound to a user-created FBO.

           */

          if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {

-            /* KW: merge conflict here, revisit. 

-             */

-            /* fix up the fb fields - these will end up wrong otherwise

-             * if the DRIdrawable changes, and everything relies on them.

-             * This is a bit messy (same as needed in _mesa_BindFramebufferEXT)

-             */

-            unsigned int i;

-            GLenum buffers[MAX_DRAW_BUFFERS];

-

             _mesa_reference_framebuffer(&newCtx->DrawBuffer, drawBuffer);

-

-            for(i = 0; i < newCtx->Const.MaxDrawBuffers; i++) {

-               buffers[i] = newCtx->Color.DrawBuffer[i];

-            }

-

-            _mesa_drawbuffers(newCtx, newCtx->Const.MaxDrawBuffers,

-                              buffers, NULL);

+            /* Update the FBO's list of drawbuffers/renderbuffers.

+             * For winsys FBOs this comes from the GL state (which may have

+             * changed since the last time this FBO was bound).

+             */

+            _mesa_update_draw_buffers(newCtx);

          }

          if (!newCtx->ReadBuffer || newCtx->ReadBuffer->Name == 0) {

             _mesa_reference_framebuffer(&newCtx->ReadBuffer, readBuffer);

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 3da7a126e..90980a8b5 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -78,9 +78,32 @@ static struct gl_renderbuffer DummyRenderbuffer;
 static struct gl_framebuffer IncompleteFramebuffer;

 

 

-#define IS_CUBE_FACE(TARGET) \

-   ((TARGET) >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && \

-    (TARGET) <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z)

+static INLINE GLboolean

+is_cube_face(GLenum target)

+{

+   return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&

+           target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);

+}

+

+

+/**

+ * Is the given FBO a user-created FBO?

+ */

+static INLINE GLboolean

+is_user_fbo(const struct gl_framebuffer *fb)

+{

+   return fb->Name != 0;

+}

+

+

+/**

+ * Is the given FBO a window system FBO (like an X window)?

+ */

+static INLINE GLboolean

+is_winsys_fbo(const struct gl_framebuffer *fb)

+{

+   return fb->Name == 0;

+}

 

 

 static void

@@ -196,7 +219,7 @@ _mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
 {

    GLuint i;

 

-   assert(fb->Name > 0);

+   assert(is_user_fbo(fb));

 

    switch (attachment) {

    case GL_COLOR_ATTACHMENT0_EXT:

@@ -244,7 +267,7 @@ static struct gl_renderbuffer_attachment *
 _mesa_get_fb0_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,

                          GLenum attachment)

 {

-   assert(fb->Name == 0);

+   assert(is_winsys_fbo(fb));

 

    switch (attachment) {

    case GL_FRONT_LEFT:

@@ -669,7 +692,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
    GLint i;

    GLuint j;

 

-   assert(fb->Name != 0);

+   assert(is_user_fbo(fb));

 

    numImages = 0;

    fb->Width = 0;

@@ -968,10 +991,11 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
                _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);

             }

 

-            if (ctx->DrawBuffer->Name) {

+            if (is_user_fbo(ctx->DrawBuffer)) {

                detach_renderbuffer(ctx, ctx->DrawBuffer, rb);

             }

-            if (ctx->ReadBuffer->Name && ctx->ReadBuffer != ctx->DrawBuffer) {

+            if (is_user_fbo(ctx->ReadBuffer)

+                && ctx->ReadBuffer != ctx->DrawBuffer) {

                detach_renderbuffer(ctx, ctx->ReadBuffer, rb);

             }

 

@@ -1203,7 +1227,7 @@ invalidate_rb(GLuint key, void *data, void *userData)
    struct gl_renderbuffer *rb = (struct gl_renderbuffer *) userData;

 

    /* If this is a user-created FBO */

-   if (fb->Name) {

+   if (is_user_fbo(fb)) {

       GLuint i;

       for (i = 0; i < BUFFER_COUNT; i++) {

          struct gl_renderbuffer_attachment *att = fb->Attachment + i;

@@ -1532,7 +1556,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
    GLuint i;

    ASSERT(ctx->Driver.RenderTexture);

 

-   if (fb->Name == 0)

+   if (is_winsys_fbo(fb));

       return; /* can't render to texture with winsys framebuffers */

 

    for (i = 0; i < BUFFER_COUNT; i++) {

@@ -1552,7 +1576,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 static void

 check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)

 {

-   if (fb->Name == 0)

+   if (is_winsys_fbo(fb));

       return; /* can't render to texture with winsys framebuffers */

 

    if (ctx->Driver.FinishRenderTexture) {

@@ -1805,7 +1829,7 @@ _mesa_CheckFramebufferStatusEXT(GLenum target)
       return 0;

    }

 

-   if (buffer->Name == 0) {

+   if (is_winsys_fbo(buffer)) {

       /* The window system / default framebuffer is always complete */

       return GL_FRAMEBUFFER_COMPLETE_EXT;

    }

@@ -1843,7 +1867,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
    }

 

    /* check framebuffer binding */

-   if (fb->Name == 0) {

+   if (is_winsys_fbo(fb)) {

       _mesa_error(ctx, GL_INVALID_OPERATION,

                   "glFramebufferTexture%sEXT", caller);

       return;

@@ -1866,7 +1890,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
          }

          else {

             err = (texObj->Target == GL_TEXTURE_CUBE_MAP)

-                ? !IS_CUBE_FACE(textarget)

+                ? !is_cube_face(textarget)

                 : (texObj->Target != textarget);

          }

       }

@@ -1970,7 +1994,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
    if ((texture != 0) &&

        (textarget != GL_TEXTURE_2D) &&

        (textarget != GL_TEXTURE_RECTANGLE_ARB) &&

-       (!IS_CUBE_FACE(textarget))) {

+       (!is_cube_face(textarget))) {

       _mesa_error(ctx, GL_INVALID_OPERATION,

                   "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);

       return;

@@ -2034,7 +2058,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
       return;

    }

 

-   if (fb->Name == 0) {

+   if (is_winsys_fbo(fb)) {

       /* Can't attach new renderbuffers to a window system framebuffer */

       _mesa_error(ctx, GL_INVALID_OPERATION, "glFramebufferRenderbufferEXT");

       return;

@@ -2111,7 +2135,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       return;

    }

 

-   if (buffer->Name == 0) {

+   if (is_winsys_fbo(buffer)) {

       /* the default / window-system FBO */

       att = _mesa_get_fb0_attachment(ctx, buffer, attachment);

    }

@@ -2143,7 +2167,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
 

    switch (pname) {

    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:

-      *params = buffer->Name == 0 ? GL_FRAMEBUFFER_DEFAULT : att->Type;

+      *params = is_winsys_fbo(buffer) ? GL_FRAMEBUFFER_DEFAULT : att->Type;

       return;

    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:

       if (att->Type == GL_RENDERBUFFER_EXT) {