diff options
| author | Anuj Phogat <[email protected]> | 2014-04-04 16:49:19 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2014-04-17 10:26:39 -0700 |
| commit | 1d350b9e228462390b1883abace24c15d4741932 (patch) | |
| tree | c1068796ecf2872ccd846a5ea0545631f733a812 /src/mesa | |
| parent | 8ed42ddd7d31b6c9c65c735ad27ca2873859129e (diff) | |
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]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_fbo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index c70b1bf36b2..f58d7c85b27 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, |