diff options
| author | Marcin Ślusarz <marcin.slusarz@intel.com> | 2020-07-28 11:55:16 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-05 22:23:20 +0200 |
| commit | 33d59a360933a3e3017f220ea7e23ac82f885ee8 (patch) | |
| tree | 97668c9121d591515fc90c5bb0010d732de07efa /src | |
| parent | e650150c812df4381150a5f13d59c6d60c9e657d (diff) | |
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@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6094>
(cherry picked from commit 884718313c80a2902b6f60b6ded63a6290d40ac7)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } /** |