Skip to content

Commit

Permalink
Merge pull request #92364 from bruvzg/rd_fix
Browse files Browse the repository at this point in the history
Fix build with `vulkan=no` and `d3d12=no` after #91505.
  • Loading branch information
akien-mga authored May 25, 2024
2 parents b7feebe + fc89a0c commit be56cab
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion platform/linuxbsd/x11/display_server_x11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 2 additions & 0 deletions platform/macos/display_server_macos.mm
Original file line number Diff line number Diff line change
Expand Up @@ -3315,9 +3315,11 @@
}

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();
}

Expand Down
2 changes: 2 additions & 0 deletions platform/windows/display_server_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down

0 comments on commit be56cab

Please sign in to comment.