fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: propagate error from gen_perf_begin_query to glBeginPerfQueryINTEL

Browse source 
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 884718313c)
This commit is contained in:
Marcin Ślusarz 2020-07-28 11:55:16 +02:00 • committed by Eric Engestrom
parent e650150c81
commit 33d59a3609
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2740,7 +2740,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
},

4
src/mesa/drivers/dri/i965/brw_performance_query.c
View file

@ -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;
}
/**