From bb8b01ef3c334789fb981c139f1b7a89b960802d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 12 May 2026 15:53:30 -0400 Subject: [PATCH] meson: fix renderdoc integration define this should be an integer Fixes: 93390d4b73d ("vk/runtime,zink: only integrate renderdoc on supported platforms") (cherry picked from commit afa9ab41b9f7adf83af648a068b8fe39a4eda5d0) Part-of: --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2e6c0ea36f0..9c31274068f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -234,7 +234,7 @@ "description": "meson: fix renderdoc integration define", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "93390d4b73d1786070613fc685aed7d63b032ca7", "notes": null diff --git a/meson.build b/meson.build index 22ed56bb0bb..7d4dca73627 100644 --- a/meson.build +++ b/meson.build @@ -2262,7 +2262,7 @@ renderdoc_integration_supported = [ 'linux', 'android', ].contains(host_machine.system()) -pre_args += '-DHAVE_RENDERDOC_INTEGRATION=@0@'.format(renderdoc_integration_supported) +pre_args += '-DHAVE_RENDERDOC_INTEGRATION=@0@'.format(renderdoc_integration_supported.to_int()) with_teflon = get_option('teflon') if with_teflon and with_tests