diff options
| author | Anuj Phogat <[email protected]> | 2014-04-07 11:20:55 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2014-04-17 10:26:05 -0700 |
| commit | 8ed42ddd7d31b6c9c65c735ad27ca2873859129e (patch) | |
| tree | abc0505415fdcaa0b1f31695301c03b457a16f77 /src/mesa/swrast/s_blit.c | |
| parent | 48fc2703e5d1c0a022a35fd77475d31d17c09177 (diff) | |
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]>
Diffstat (limited to 'src/mesa/swrast/s_blit.c')
| -rw-r--r-- | src/mesa/swrast/s_blit.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c index 1ba188c5f7a..e3b45f14682 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; |