The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-27 05:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't block on surface creation in GetTransformHint

Browse Source 
We want to avoid blocking on surface creation unless necessary, this commit doesn't wait on the creation of the surface as it default initializes the value which'll generally be `Identity` or the transformation of the previous surface if it was lost.

Co-authored-by: Billy Laws <blaws05@gmail.com>
This commit is contained in:
PixelyIon 2022-07-29 03:32:20 +05:30
parent 35133381b6
commit 0992fde028
No known key found for this signature in database
GPG Key ID: 11BC6C3201BC2C05
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/cpp/skyline/gpu/presentation_engine.cpp
View File

@ -377,8 +377,8 @@ namespace skyline::gpu {
u64 PresentationEngine::Present(const std::shared_ptr<TextureView> &texture, i64 timestamp, i64 swapInterval, AndroidRect crop, NativeWindowScalingMode scalingMode, NativeWindowTransform transform, skyline::service::hosbinder::AndroidFence fence, const std::function<void()> &presentCallback) { u64 PresentationEngine::Present(const std::shared_ptr<TextureView> &texture, i64 timestamp, i64 swapInterval, AndroidRect crop, NativeWindowScalingMode scalingMode, NativeWindowTransform transform, skyline::service::hosbinder::AndroidFence fence, const std::function<void()> &presentCallback) {
if (!vkSurface.has_value()) { if (!vkSurface.has_value()) {
// We want this function to generally (not necessarily always) block when a surface is not present to implicitly pause the game // We want this function to generally (not necessarily always) block when a surface is not present to implicitly pause the game
std::unique_lock lock(mutex); std::unique_lock lock{mutex};
surfaceCondition.wait(lock, [this]() { return vkSurface.has_value(); }); surfaceCondition.wait(lock, [this] { return vkSurface.has_value(); });
} }
presentQueue.Push(PresentableFrame{ presentQueue.Push(PresentableFrame{
@ -397,8 +397,7 @@ namespace skyline::gpu {
} }
NativeWindowTransform PresentationEngine::GetTransformHint() { NativeWindowTransform PresentationEngine::GetTransformHint() {
std::unique_lock lock(mutex); std::unique_lock lock{mutex};
surfaceCondition.wait(lock, [this]() { return vkSurface.has_value(); });
return GetAndroidTransform(vkSurfaceCapabilities.currentTransform); return GetAndroidTransform(vkSurfaceCapabilities.currentTransform);
} }
} }

2
app/src/main/cpp/skyline/gpu/presentation_engine.h
View File

@ -32,7 +32,7 @@ namespace skyline::gpu {
i64 windowLastTimestamp{}; //!< The last timestamp submitted to the window, 0 or CLOCK_MONOTONIC value i64 windowLastTimestamp{}; //!< The last timestamp submitted to the window, 0 or CLOCK_MONOTONIC value
std::optional<vk::raii::SurfaceKHR> vkSurface; //!< The Vulkan Surface object that is backed by ANativeWindow std::optional<vk::raii::SurfaceKHR> vkSurface; //!< The Vulkan Surface object that is backed by ANativeWindow
vk::SurfaceCapabilitiesKHR vkSurfaceCapabilities; //!< The capabilities of the current Vulkan Surface vk::SurfaceCapabilitiesKHR vkSurfaceCapabilities{}; //!< The capabilities of the current Vulkan Surface
std::optional<vk::raii::SwapchainKHR> vkSwapchain; //!< The Vulkan swapchain and the properties associated with it std::optional<vk::raii::SwapchainKHR> vkSwapchain; //!< The Vulkan swapchain and the properties associated with it
vk::raii::Fence acquireFence; //!< A fence for acquiring an image from the swapchain vk::raii::Fence acquireFence; //!< A fence for acquiring an image from the swapchain