Mesa (master): virgl: Add support for passing GL_ANY_SAMPLES_PASSED_CONSERVATIVE

[Dave Airlie]

Module: Mesa
Branch: master
Commit: fb4011ace9022e674639f2743272b7eba650cde3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb4011ace9022e674639f2743272b7eba650cde3

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Wed May  9 16:51:49 2018 +0200

virgl: Add support for passing GL_ANY_SAMPLES_PASSED_CONSERVATIVE

This is needed for fixing CTS:
   dEQP-GLES3.functional.occlusion_query.conservative*

Reviewed-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Gert Wollny <gert.wollny at collabora.com>

---

 src/gallium/drivers/virgl/virgl_query.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/virgl/virgl_query.c b/src/gallium/drivers/virgl/virgl_query.c
index 3a930d2966..e4d955442b 100644
--- a/src/gallium/drivers/virgl/virgl_query.c
+++ b/src/gallium/drivers/virgl/virgl_query.c
@@ -48,12 +48,13 @@ struct virgl_query {
 #define VIRGL_QUERY_SO_OVERFLOW_PREDICATE 8
 #define VIRGL_QUERY_GPU_FINISHED          9
 #define VIRGL_QUERY_PIPELINE_STATISTICS  10
+#define VIRGL_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE 11
 
 static const int pquery_map[] =
 {
    VIRGL_QUERY_OCCLUSION_COUNTER,
    VIRGL_QUERY_OCCLUSION_PREDICATE,
-   -1,
+   VIRGL_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE,
    VIRGL_QUERY_TIMESTAMP,
    VIRGL_QUERY_TIMESTAMP_DISJOINT,
    VIRGL_QUERY_TIME_ELAPSED,