On 04/07/2014 10:55 AM, Anuj Phogat wrote:
> Fixes failures in Khronos OpenGL CTS test conditional_render_test9
> 
> Signed-off-by: Anuj Phogat <[email protected]>
> ---
>  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 d0e1349..b5b93a6 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"
> @@ -833,6 +834,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,
> 

Reviewed-by: Kenneth Graunke <[email protected]>

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to