From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Aug 2016 16:15:14 +0000 (-0600)
Subject: svga: loosen the condition to flush in get_query_result_vgpu10()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e292f38c6c2aba28299b988ec4654b7c02d9adb8;p=mesa.git

svga: loosen the condition to flush in get_query_result_vgpu10()

Fixes piglit spec/ext_transform_feedback/overflow-edge-cases segfaults
because the query's fence pointer was null.

Tested with Piglit, Sauerbraten, ETQW.

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

diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c
index f09590aa0ee..dcb26ebc16c 100644
--- a/src/gallium/drivers/svga/svga_pipe_query.c
+++ b/src/gallium/drivers/svga/svga_pipe_query.c
@@ -638,7 +638,7 @@ get_query_result_vgpu10(struct svga_context *svga, struct svga_query *sq,
 
    sws->query_get_result(sws, sq->gb_query, sq->offset, &queryState, result, resultLen);
 
-   if (queryState == SVGA3D_QUERYSTATE_NEW && !sq->fence) {
+   if (!sq->fence) {
       /* The query hasn't been submitted yet.  We need to submit it now
        * since the GL spec says "Querying the state for a given occlusion
        * query forces that occlusion query to complete within a finite amount