Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 21:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Account for the case surface_capabilities.currentExtent is unset

Browse Source 
Wayland in particular sets surface_capabilities.currentExtent.width to
the special value 0xFFFFFFFF, which is valid per spec.
Fixes #98779

It may also fix misc issues when resizing on all platforms.

Superseedes PR #98780 , thanks to user tdaven for the original patch.
PR #98780 would break Android support as it did not account that width
and height might need to be swapped.

Replaced manual swap by Godot's SWAP(), which indicates intention much
easier.
This commit is contained in:
Trevor Davenport 2024-11-02 17:06:33 -06:00 committed by Matias N. Goldberg
parent b00e1cbf74
commit a5070af460
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/vulkan/rendering_device_driver_vulkan.cpp
View File

@ -2887,21 +2887,28 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
// No swapchain yet, this is the first time we're creating it. // No swapchain yet, this is the first time we're creating it.
if (!swap_chain->vk_swapchain) { if (!swap_chain->vk_swapchain) {
uint32_t width = surface_capabilities.currentExtent.width; if (surface_capabilities.currentExtent.width == 0xFFFFFFFF) {
uint32_t height = surface_capabilities.currentExtent.height; // The current extent is currently undefined, so the current surface width and height will be clamped to the surface's capabilities.
// We make sure to overwrite surface_capabilities.currentExtent.width so that the same check further below
// does not set extent.width = CLAMP( surface->width, ... ) on the first run of this function, because
// that'd be potentially unswapped.
surface_capabilities.currentExtent.width = CLAMP(surface->width, surface_capabilities.minImageExtent.width, surface_capabilities.maxImageExtent.width);
surface_capabilities.currentExtent.height = CLAMP(surface->height, surface_capabilities.minImageExtent.height, surface_capabilities.maxImageExtent.height);
}
// We must SWAP() only once otherwise we'll keep ping-ponging between
// the right and wrong resolutions after multiple calls to swap_chain_resize().
if (surface_capabilities.currentTransform & VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR || if (surface_capabilities.currentTransform & VK_SURFACE_TRANSFORM_ROTATE_90_BIT_KHR ||
surface_capabilities.currentTransform & VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR) { surface_capabilities.currentTransform & VK_SURFACE_TRANSFORM_ROTATE_270_BIT_KHR) {
// Swap to get identity width and height. // Swap to get identity width and height.
surface_capabilities.currentExtent.height = width; SWAP(surface_capabilities.currentExtent.width, surface_capabilities.currentExtent.height);
surface_capabilities.currentExtent.width = height;
} }
native_display_size = surface_capabilities.currentExtent;
} }
VkExtent2D extent; VkExtent2D extent;
if (surface_capabilities.currentExtent.width == 0xFFFFFFFF) { if (surface_capabilities.currentExtent.width == 0xFFFFFFFF) {
// The current extent is currently undefined, so the current surface width and height will be clamped to the surface's capabilities. // The current extent is currently undefined, so the current surface width and height will be clamped to the surface's capabilities.
// We can only be here on the second call to swap_chain_resize(), by which time surface->width & surface->height should already be swapped if needed.
extent.width = CLAMP(surface->width, surface_capabilities.minImageExtent.width, surface_capabilities.maxImageExtent.width); extent.width = CLAMP(surface->width, surface_capabilities.minImageExtent.width, surface_capabilities.maxImageExtent.width);
extent.height = CLAMP(surface->height, surface_capabilities.minImageExtent.height, surface_capabilities.maxImageExtent.height); extent.height = CLAMP(surface->height, surface_capabilities.minImageExtent.height, surface_capabilities.maxImageExtent.height);
} else { } else {
@ -2991,7 +2998,7 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
swap_create_info.minImageCount = desired_swapchain_images; swap_create_info.minImageCount = desired_swapchain_images;
swap_create_info.imageFormat = swap_chain->format; swap_create_info.imageFormat = swap_chain->format;
swap_create_info.imageColorSpace = swap_chain->color_space; swap_create_info.imageColorSpace = swap_chain->color_space;
swap_create_info.imageExtent = native_display_size; swap_create_info.imageExtent = extent;
swap_create_info.imageArrayLayers = 1; swap_create_info.imageArrayLayers = 1;
swap_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swap_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
swap_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; swap_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;

1
drivers/vulkan/rendering_device_driver_vulkan.h
View File

@ -367,7 +367,6 @@ private:
}; };
void _swap_chain_release(SwapChain *p_swap_chain); void _swap_chain_release(SwapChain *p_swap_chain);
VkExtent2D native_display_size;
public: public:
virtual SwapChainID swap_chain_create(RenderingContextDriver::SurfaceID p_surface) override final; virtual SwapChainID swap_chain_create(RenderingContextDriver::SurfaceID p_surface) override final;