Module: Mesa Branch: 10.1 Commit: 8c95c73f1168347e4fd25bfdfe9c871dc7a158ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c95c73f1168347e4fd25bfdfe9c871dc7a158ab
Author: Anuj Phogat <[email protected]> Date: Fri Apr 4 16:49:19 2014 -0700 i965: Add glBlitFramebuffer to commands affected by conditional rendering Fixes failures in Khronos OpenGL CTS test conditional_render_test9 Cc: <[email protected]> Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> (cherry picked from commit 1d350b9e228462390b1883abace24c15d4741932) --- src/mesa/drivers/dri/i965/intel_fbo.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 1e56d3c..a9e3769 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -38,6 +38,7 @@ #include "main/image.h" #include "main/hash_table.h" #include "main/set.h" +#include "main/condrender.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" @@ -759,6 +760,13 @@ intel_blit_framebuffer(struct gl_context *ctx, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { + /* 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; + mask = brw_blorp_framebuffer(brw_context(ctx), srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
