Nouveau - Aug 2017 - [PATCH] nvc0: fix handling of inverted render condition

Wether we wait on an inverted rendering condition or not, we should not render
on a passed query.

This fixes the CTS test case
'KHR-GL45.conditional_render_inverted.functional'.

Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
---
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
index e92695bd6a..e6c7d5a3ad 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
@@ -132,7 +132,7 @@ nvc0_render_condition(struct pipe_context *pipe,
             else
                cond = NVC0_3D_COND_MODE_RES_NON_ZERO;
          } else {
-            cond = wait ? NVC0_3D_COND_MODE_EQUAL : NVC0_3D_COND_MODE_ALWAYS;
+            cond = NVC0_3D_COND_MODE_EQUAL;
          }
          break;
       default:
-- 
2.14.0

So ... how do you handle the case of a query that hasn't completed yet
and one of the no-wait enums is passed in?

On Thu, Aug 17, 2017 at 4:43 PM, Tobias Klausmann
<tobias.johannes.klausmann at mni.thm.de> wrote:
> Wether we wait on an inverted rendering condition or not, we should not
render
> on a passed query.
>
> This fixes the CTS test case
'KHR-GL45.conditional_render_inverted.functional'.
>
> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at
mni.thm.de>
> ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> index e92695bd6a..e6c7d5a3ad 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> @@ -132,7 +132,7 @@ nvc0_render_condition(struct pipe_context *pipe,
>              else
>                 cond = NVC0_3D_COND_MODE_RES_NON_ZERO;
>           } else {
> -            cond = wait ? NVC0_3D_COND_MODE_EQUAL :
NVC0_3D_COND_MODE_ALWAYS;
> +            cond = NVC0_3D_COND_MODE_EQUAL;
>           }
>           break;
>        default:
> --
> 2.14.0
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau