summaryrefslogtreecommitdiffstats
path: root/drivers/vulkan
diff options
context:
space:
mode:
authorGeorge L. Albany <Megacake1234@gmail.com>2024-11-15 20:50:25 +0000
committerGitHub <noreply@github.com>2024-11-15 20:50:25 +0000
commit9767837a7ec40697788765e581131cb2cf172567 (patch)
treed58eaa8daad3e30c8b84a50e70a21f93b05525c5 /drivers/vulkan
parentac1a49725fc038ae11ef9060fecb2b0f9c6333b2 (diff)
parent4a5836e5462554a738b502aa8bbde5e4a051eb56 (diff)
downloadredot-engine-9767837a7ec40697788765e581131cb2cf172567.tar.gz
Merge pull request #864 from Spartan322/merge/6c05ec3
Merge commit godotengine/godot@6c05ec3
Diffstat (limited to 'drivers/vulkan')
-rw-r--r--drivers/vulkan/rendering_device_driver_vulkan.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/vulkan/rendering_device_driver_vulkan.cpp b/drivers/vulkan/rendering_device_driver_vulkan.cpp
index 3643f599d9..38c4f4ae07 100644
--- a/drivers/vulkan/rendering_device_driver_vulkan.cpp
+++ b/drivers/vulkan/rendering_device_driver_vulkan.cpp
@@ -3034,13 +3034,10 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
#if defined(SWAPPY_FRAME_PACING_ENABLED)
if (swappy_frame_pacer_enable) {
- const double max_fps = Engine::get_singleton()->get_max_fps();
- const uint64_t max_time = max_fps > 0 ? uint64_t((1000.0 * 1000.0 * 1000.0) / max_fps) : 0;
-
SwappyVk_initAndGetRefreshCycleDuration(get_jni_env(), static_cast<OS_Android *>(OS::get_singleton())->get_godot_java()->get_activity(), physical_device,
vk_device, swap_chain->vk_swapchain, &swap_chain->refresh_duration);
SwappyVk_setWindow(vk_device, swap_chain->vk_swapchain, static_cast<OS_Android *>(OS::get_singleton())->get_native_window());
- SwappyVk_setSwapIntervalNS(vk_device, swap_chain->vk_swapchain, MAX(swap_chain->refresh_duration, max_time));
+ SwappyVk_setSwapIntervalNS(vk_device, swap_chain->vk_swapchain, swap_chain->refresh_duration);
enum SwappyModes {
PIPELINE_FORCED_ON,