Module: Mesa Branch: master Commit: 8ed42ddd7d31b6c9c65c735ad27ca2873859129e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ed42ddd7d31b6c9c65c735ad27ca2873859129e
Author: Anuj Phogat <[email protected]> Date: Mon Apr 7 11:20:55 2014 -0700 swrast: Add glBlitFramebuffer to commands affected by conditional rendering Cc: <[email protected]> Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- src/mesa/swrast/s_blit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c index 1ba188c..e3b45f1 100644 --- 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
