Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/state_tracker/st_cb_blit.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.c

1 files changed, 13 insertions, 1 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c
index 4c3d561a4..282f84ec7 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_blit.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c
@@ -109,6 +109,11 @@ st_BlitFramebuffer(struct gl_context *ctx,
       dstY1 = tmp;

    }

 

+   /* Disable conditional rendering. */

+   if (st->render_condition) {

+      st->pipe->render_condition(st->pipe, NULL, 0);

+   }

+

    if (mask & GL_COLOR_BUFFER_BIT) {

       struct gl_renderbuffer_attachment *srcAtt =

          &readFB->Attachment[readFB->_ColorReadBufferIndex];

@@ -121,7 +126,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
          struct pipe_surface *dstSurf = dstRb->surface;

 

          if (!srcObj->pt)

-            return;

+            goto done;

 

          util_blit_pixels(st->blit, srcObj->pt, srcAtt->TextureLevel,

                           srcX0, srcY0, srcX1, srcY1,

@@ -199,6 +204,13 @@ st_BlitFramebuffer(struct gl_context *ctx,
          }

       }

    }

+

+done:

+   /* Restore conditional rendering state. */

+   if (st->render_condition) {

+      st->pipe->render_condition(st->pipe, st->render_condition,

+                                 st->condition_mode);

+   }

 }