diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-04-28 09:50:28 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-05-09 16:56:38 +0100 |
| commit | f4b0904fde28b44fbfdecf09f521949cba65091e (patch) | |
| tree | d330af5c190b56987fae57b90addd543b1791fc0 | |
| parent | 1ec1c1ad1722e3cece22fafc8f901b8a63d3cfaa (diff) | |
| download | mesa-f4b0904fde28b44fbfdecf09f521949cba65091e.tar.gz | |
zink: allow vk 1.2 timelineSemaphore feature if extension isn't supported
this is a weird case but whatever
cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22760>
(cherry picked from commit e205a4839bf9b0e82e5cb7dbf05ec369c2630ee6)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_screen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 3b23c6570dc..e796175df80 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -310,7 +310,7 @@ "description": "zink: allow vk 1.2 timelineSemaphore feature if extension isn't supported", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 2503060ff06..b44f6209a3c 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2766,7 +2766,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config) } zink_internal_setup_moltenvk(screen); - if (!screen->info.have_KHR_timeline_semaphore) { + if (!screen->info.have_KHR_timeline_semaphore && !screen->info.feats12.timelineSemaphore) { mesa_loge("zink: KHR_timeline_semaphore is required"); goto fail; } |