diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-05-25 20:34:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-25 20:34:03 +0200 |
| commit | be56cab58c056c074d1e02cd0b38641204e39f41 (patch) | |
| tree | 9941d6cf37b412fa9b1878343df419ef08c0919b | |
| parent | b7feebefabc2d48b0d4794cd31fc141f1caecc5c (diff) | |
| parent | fc89a0c1182f15b9a8307245c256d922c9d12666 (diff) | |
| download | redot-engine-be56cab58c056c074d1e02cd0b38641204e39f41.tar.gz | |
Merge pull request #92364 from bruvzg/rd_fix
Fix build with `vulkan=no` and `d3d12=no` after #91505.
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.cpp | 3 | ||||
| -rw-r--r-- | platform/macos/display_server_macos.mm | 2 | ||||
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 2491064a58..2c07acf94f 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -5201,10 +5201,11 @@ bool DisplayServerX11::is_window_transparency_available() const { if (XGetSelectionOwner(x11_display, net_wm_cm) == None) { return false; } - +#if defined(RD_ENABLED) if (rendering_device && !rendering_device->is_composite_alpha_supported()) { return false; } +#endif return OS::get_singleton()->is_layered_allowed(); } diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 0b11bf8287..db71c48eff 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -3315,9 +3315,11 @@ void DisplayServerMacOS::delete_status_indicator(IndicatorID p_id) { } bool DisplayServerMacOS::is_window_transparency_available() const { +#if defined(RD_ENABLED) if (rendering_device && !rendering_device->is_composite_alpha_supported()) { return false; } +#endif return OS::get_singleton()->is_layered_allowed(); } diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index b84e1f8eea..03584977fe 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -3408,9 +3408,11 @@ bool DisplayServerWindows::is_window_transparency_available() const { return false; } } +#if defined(RD_ENABLED) if (rendering_device && !rendering_device->is_composite_alpha_supported()) { return false; } +#endif return OS::get_singleton()->is_layered_allowed(); } |