Mesa (master): i965: Add glBlitFramebuffer to commands affected by conditional rendering
Anuj Phogat
aphogat at kemper.freedesktop.org
Thu Apr 17 17:35:44 UTC 2014
Module: Mesa
Branch: master
Commit: 1d350b9e228462390b1883abace24c15d4741932
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d350b9e228462390b1883abace24c15d4741932
Author: Anuj Phogat <anuj.phogat at gmail.com>
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: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
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 c70b1bf..f58d7c8 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"
@@ -851,6 +852,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,
More information about the mesa-commit
mailing list