From: Neha Bhende <bhenden@vmware.com>
Date: Wed, 28 Sep 2016 17:48:45 +0000 (-0700)
Subject: svga: Add render_condition boolean flag in struct svga_context
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03e1b7cacdf3b595262e50679a83544549c61b3d;p=mesa.git

svga: Add render_condition boolean flag in struct svga_context

set render_condition flag when driver performs conditional rendering.
Blit using DXPredCopyRegion command gets affected by conditional rendering so
We should check this flag while performing blit operation

Tested with piglit tests.

v2: As per Charmaine's comment, setting render_condition flag if svga_query is valid.
Tested with pigit tests.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h
index 3e65384a07a..5eb7fc87187 100644
--- a/src/gallium/drivers/svga/svga_context.h
+++ b/src/gallium/drivers/svga/svga_context.h
@@ -589,6 +589,8 @@ struct svga_context
       SVGA3dQueryId query_id;
       boolean cond;
    } pred;
+
+   boolean render_condition;
 };
 
 /* A flag for each state_tracker state object:
diff --git a/src/gallium/drivers/svga/svga_pipe_blit.c b/src/gallium/drivers/svga/svga_pipe_blit.c
index 75576f2d72c..054e3f5a1c0 100644
--- a/src/gallium/drivers/svga/svga_pipe_blit.c
+++ b/src/gallium/drivers/svga/svga_pipe_blit.c
@@ -265,7 +265,8 @@ can_blit_via_copy_region_vgpu10(struct svga_context *svga,
       blit_info->mask != (PIPE_MASK_ZS))
      return false;
 
-   if (blit_info->alpha_blend || blit_info->render_condition_enable ||
+   if (blit_info->alpha_blend ||
+       (svga->render_condition && blit_info->render_condition_enable) ||
        blit_info->scissor_enable)
       return false;
 
diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c
index a7bfb4ea265..e8bae264cf1 100644
--- a/src/gallium/drivers/svga/svga_pipe_query.c
+++ b/src/gallium/drivers/svga/svga_pipe_query.c
@@ -1242,6 +1242,8 @@ svga_render_condition(struct pipe_context *pipe, struct pipe_query *q,
       svga->pred.query_id = queryId;
       svga->pred.cond = condition;
    }
+
+   svga->render_condition = (sq != NULL);
 }