OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: ensure i915 Gallium driver includes Intel sources

Browse Source 
Ensure builds flag the use of Intel sources when the i915 Gallium driver
is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if
other Intel-based configuration options are not enabled:

    ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common".

Signed-off-by: James Knight <james.d.knight@live.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22490>
This commit is contained in:
James Knight
2023-04-13 16:38:51 -04:00
committed by Marge Bot
parent cf90be90ad
commit cd861b7f38
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental')
with_any_vk = _vulkan_drivers.length() != 0
with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk
with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools
with_any_intel = [
with_gallium_crocus,
with_gallium_i915,
with_gallium_iris,
with_intel_hasvk,
with_intel_tools,
with_intel_vk,
].contains(true)
if with_swrast_vk and not with_gallium_softpipe
error('swrast vulkan requires gallium swrast')