Module: Mesa Branch: staging/23.0 Commit: a3c6a52cf12d682af324a3ef4f91df21e84a58d4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3c6a52cf12d682af324a3ef4f91df21e84a58d4
Author: Sebastian Wick <[email protected]> Date: Mon Feb 20 19:28:02 2023 +0100 loader: do not check the mesa DRI_Mesa version if it was not found Signed-off-by: Sebastian Wick <[email protected]> Fixes: 1026d2934419 ("dri: Introduce internal Mesa DRI driver loader extension.") Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21429> (cherry picked from commit f4ce19063c2e8f2b9f4567e8b468896f957d3d8b) --- .pick_status.json | 2 +- src/loader/loader.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index aad02c4283d..6d4b0486e9f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -13,7 +13,7 @@ "description": "loader: do not check the mesa DRI_Mesa version if it was not found", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1026d29344192755dd340d6ac13a9674189d2d61" }, diff --git a/src/loader/loader.c b/src/loader/loader.c index dd6f837911a..b67af97aa99 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -628,6 +628,7 @@ loader_bind_extensions(void *data, match->name, match->version); if (!match->optional) ret = false; + continue; } /* The loaders rely on the loaded DRI drivers being from the same Mesa
