r600g: Implement GL_ARB_texture_gather

[mesa.git] / src / mesa / swrast / s_blit.c

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 1ba188c5f7a91fb0e4bd24b3c9e3b81a4d480b92..e3b45f14682f75a02e61af72592b46043fbe84b2 100644 (file)
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -29,6 +29,7 @@
 #include "main/macros.h"
 #include "main/format_unpack.h"
 #include "main/format_pack.h"
+#include "main/condrender.h"
 #include "s_context.h"
 
 
@@ -748,6 +749,13 @@ _swrast_BlitFramebuffer(struct gl_context *ctx,
    };
    GLint i;
 
+   /* Page 679 of OpenGL 4.4 spec says:
+    *    "Added BlitFramebuffer to commands affected by conditional rendering in
+    *     section 10.10 (Bug 9562)."
+    */
+   if (!_mesa_check_conditional_render(ctx))
+      return; /* Do not blit */
+
    if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,
                         &dstX0, &dstY0, &dstX1, &dstY1)) {
       return;