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 /.pick_status.json | |
| 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 '.pick_status.json')
| -rw-r--r-- | .pick_status.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 47cce785e09..201d15b7c6e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 }, |