Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GeneralSettings: Update vsync after settings close #401

Merged
merged 5 commits into from
Oct 31, 2022
Merged

GeneralSettings: Update vsync after settings close #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3877651
Update vsync after settings close
goeiecool9999 Oct 21, 2022
de3dc7a
Vulkan cannot currently change vsync mode while running
goeiecool9999 Oct 21, 2022
0e523eb
only show match emulated display option on windows
goeiecool9999 Oct 21, 2022
28ef065
Implement suggestion of checking once per frame if config changed.
goeiecool9999 Oct 29, 2022
5bfd5a8
fix windows opengl
goeiecool9999 Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,14 +352,19 @@ void OpenGLRenderer::NotifyLatteCommandProcessorIdle()
glFlush();
}

void OpenGLRenderer::EnableVSync(int state)
void OpenGLRenderer::UpdateVSyncState()
{
int configValue = GetConfig().vsync.GetValue();
if(m_activeVSyncState != configValue)
{
#if BOOST_OS_WINDOWS
if(wglSwapIntervalEXT)
wglSwapIntervalEXT(state); // 1 = enabled, 0 = disabled
if(wglSwapIntervalEXT)
wglSwapIntervalEXT(configValue); // 1 = enabled, 0 = disabled
#else
cemuLog_log(LogType::Force, "OpenGL vsync not implemented");
cemuLog_log(LogType::Force, "OpenGL vsync not implemented");
#endif
m_activeVSyncState = configValue;
}
}

bool IsRunningInWine();
Expand Down Expand Up @@ -438,6 +443,7 @@ void OpenGLRenderer::EnableDebugMode()
void OpenGLRenderer::SwapBuffers(bool swapTV, bool swapDRC)
{
GLCanvas_SwapBuffers(swapTV, swapDRC);
UpdateVSyncState();

if (swapTV)
cleanupAfterFrame();
Expand Down
5 changes: 3 additions & 2 deletions src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class OpenGLRenderer : public Renderer
void Flush(bool waitIdle = false) override;
void NotifyLatteCommandProcessorIdle() override;

void EnableVSync(int state) override;
void UpdateVSyncState();

void EnableDebugMode() override;
void SwapBuffers(bool swapTV = true, bool swapDRC = true) override;
Expand Down Expand Up @@ -168,6 +168,7 @@ class OpenGLRenderer : public Renderer
GLuint m_defaultFramebufferId;
GLuint m_pipeline = 0;

int m_activeVSyncState{};
bool m_isPadViewContext{};

// rendertarget viewport
Expand Down Expand Up @@ -282,4 +283,4 @@ class OpenGLRenderer : public Renderer
std::vector<bufferCacheReleaseQueueEntry_t> bufferCacheEntries;
}m_destructionQueues;

};
};
3 changes: 1 addition & 2 deletions src/Cafe/HW/Latte/Renderer/Renderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class Renderer
virtual bool GetVRAMInfo(int& usageInMB, int& totalInMB) const;

virtual void EnableDebugMode() {}
virtual void EnableVSync(int state) = 0;

virtual void ClearColorbuffer(bool padView) = 0;
virtual void DrawEmptyFrame(bool mainWindow) = 0;
Expand Down Expand Up @@ -176,4 +175,4 @@ class Renderer
#endif
};

extern std::unique_ptr<Renderer> g_renderer;
extern std::unique_ptr<Renderer> g_renderer;
33 changes: 16 additions & 17 deletions src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,22 +1382,22 @@ VkSurfaceFormatKHR VulkanRenderer::ChooseSwapSurfaceFormat(const std::vector<VkS

VkPresentModeKHR VulkanRenderer::ChooseSwapPresentMode(const std::vector<VkPresentModeKHR>& modes)
{
m_vsync_state = (VSync)GetConfig().vsync.GetValue();
if (m_vsync_state == VSync::MAILBOX)
const auto vsyncState = (VSync)GetConfig().vsync.GetValue();
if (vsyncState == VSync::MAILBOX)
{
if (std::find(modes.cbegin(), modes.cend(), VK_PRESENT_MODE_MAILBOX_KHR) != modes.cend())
return VK_PRESENT_MODE_MAILBOX_KHR;

forceLog_printf("Vulkan: Can't find mailbox present mode");
}
else if (m_vsync_state == VSync::Immediate)
else if (vsyncState == VSync::Immediate)
{
if (std::find(modes.cbegin(), modes.cend(), VK_PRESENT_MODE_IMMEDIATE_KHR) != modes.cend())
return VK_PRESENT_MODE_IMMEDIATE_KHR;

forceLog_printf("Vulkan: Can't find immediate present mode");
}
else if (m_vsync_state == VSync::SYNC_AND_LIMIT)
else if (vsyncState == VSync::SYNC_AND_LIMIT)
{
LatteTiming_EnableHostDrivenVSync();
// use immediate mode if available, other wise fall back to
Expand Down Expand Up @@ -1991,19 +1991,6 @@ void VulkanRenderer::QueryAvailableFormats()
}
}

void VulkanRenderer::EnableVSync(int state)
{
if (m_vsync_state == (VSync)state)
return;

m_vsync_state = (VSync)state;

// recreate spawn chains (vsync state is checked from config in ChooseSwapPresentMode)
RecreateSwapchain(true);
if (m_padSwapchainInfo)
RecreateSwapchain(false);
}

bool VulkanRenderer::ImguiBegin(bool mainWindow)
{
if (!Renderer::ImguiBegin(mainWindow))
Expand Down Expand Up @@ -2962,6 +2949,16 @@ void VulkanRenderer::RecreateSwapchain(bool main_window)
ImguiInit();
}

void VulkanRenderer::UpdateVSyncState(bool main_window)
{
auto& swapInfo = main_window ? *m_mainSwapchainInfo : *m_padSwapchainInfo;
const auto configValue = (VSync)GetConfig().vsync.GetValue();
if(swapInfo.m_activeVSyncState != configValue){
RecreateSwapchain(main_window);
swapInfo.m_activeVSyncState = configValue;
}
}

void VulkanRenderer::SwapBuffer(bool main_window)
{
auto& swapInfo = main_window ? *m_mainSwapchainInfo : *m_padSwapchainInfo;
Expand Down Expand Up @@ -2999,6 +2996,8 @@ void VulkanRenderer::SwapBuffer(bool main_window)
}
}

UpdateVSyncState(main_window);

auto& swapinfo = main_window ? *m_mainSwapchainInfo : *m_padSwapchainInfo;
AcquireNextSwapchainImage(main_window);

Expand Down
5 changes: 2 additions & 3 deletions src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,6 @@ class VulkanRenderer : public Renderer
void QueryMemoryInfo();
void QueryAvailableFormats();

void EnableVSync(int state) override;

#if BOOST_OS_WINDOWS
static VkSurfaceKHR CreateWinSurface(VkInstance instance, HWND hwindow);
#endif
Expand Down Expand Up @@ -466,6 +464,7 @@ class VulkanRenderer : public Renderer
VkExtent2D swapchainExtend{};
uint32 swapchainImageIndex = (uint32)-1;
uint32 m_acquireIndex = 0; // increases with every successful vkAcquireNextImageKHR
VSync m_activeVSyncState = VSync::Immediate;

struct AcquireInfo
{
Expand Down Expand Up @@ -557,8 +556,8 @@ class VulkanRenderer : public Renderer
static bool CheckDeviceExtensionSupport(const VkPhysicalDevice device, FeatureControl& info);
static std::vector<const char*> CheckInstanceExtensionSupport(FeatureControl& info);

void UpdateVSyncState(bool main_window);
void SwapBuffer(bool main_window);
VSync m_vsync_state = VSync::Immediate;

struct SwapChainSupportDetails
{
Expand Down
3 changes: 2 additions & 1 deletion src/gui/GeneralSettings2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,8 +1334,9 @@ void GeneralSettings2::HandleGraphicsApiSelection()
m_vsync->AppendString(_("Off"));
m_vsync->AppendString(_("Double buffering"));
m_vsync->AppendString(_("Triple buffering"));
#if BOOST_OS_WINDOWS
m_vsync->AppendString(_("Match emulated display (Experimental)"));
#endif

m_vsync->Select(selection);

Expand Down