<div dir="ltr">Reviewed-by: Brian Paul <<a href="mailto:brianp@vmware.com">brianp@vmware.com</a>><br><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Apr 7, 2014 at 1:08 PM, Anuj Phogat <span dir="ltr"><<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>><br>
---<br>
 src/mesa/swrast/s_blit.c | 8 ++++++++<br>
 1 file changed, 8 insertions(+)<br>
<br>
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c<br>
index 1ba188c..e3b45f1 100644<br>
--- a/src/mesa/swrast/s_blit.c<br>
+++ b/src/mesa/swrast/s_blit.c<br>
@@ -29,6 +29,7 @@<br>
 #include "main/macros.h"<br>
 #include "main/format_unpack.h"<br>
 #include "main/format_pack.h"<br>
+#include "main/condrender.h"<br>
 #include "s_context.h"<br>
<br>
<br>
@@ -748,6 +749,13 @@ _swrast_BlitFramebuffer(struct gl_context *ctx,<br>
    };<br>
    GLint i;<br>
<br>
+   /* Page 679 of OpenGL 4.4 spec says:<br>
+    *    "Added BlitFramebuffer to commands affected by conditional rendering in<br>
+    *     section 10.10 (Bug 9562)."<br>
+    */<br>
+   if (!_mesa_check_conditional_render(ctx))<br>
+      return; /* Do not blit */<br>
+<br>
    if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1,<br>
                         &dstX0, &dstY0, &dstX1, &dstY1)) {<br>
       return;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>