Mesa (staging/20.1): i965: propagate error from gen_perf_begin_query to glBeginPerfQueryINTEL

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: cfdf35b7d4ab922e04b28967678f8488451be846
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfdf35b7d4ab922e04b28967678f8488451be846

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Tue Jul 28 11:55:16 2020 +0200

i965: propagate error from gen_perf_begin_query to glBeginPerfQueryINTEL

Otherwise mesa will crash in glEndPerfQueryINTEL because OA BO is NULL.

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6094>
(cherry picked from commit 884718313c80a2902b6f60b6ded63a6290d40ac7)

---

 .pick_status.json                                 | 2 +-
 src/mesa/drivers/dri/i965/brw_performance_query.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 78e748b1c01..60441e04af2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "i965: propagate error from gen_perf_begin_query to glBeginPerfQueryINTEL",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index cc531d97ff7..7037e25679a 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -247,12 +247,12 @@ brw_begin_perf_query(struct gl_context *ctx,
 
    DBG("Begin(%d)\n", o->Id);
 
-   gen_perf_begin_query(perf_ctx, obj);
+   bool ret = gen_perf_begin_query(perf_ctx, obj);
 
    if (INTEL_DEBUG & DEBUG_PERFMON)
       dump_perf_queries(brw);
 
-   return true;
+   return ret;
 }
 
 /**