From d97ee992037705e8e1d8bb6e7489b7da7456b56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 Nov 2017 10:09:44 +0100 Subject: [PATCH 1/3] Win32: Add (debug) to window title in debug builds --- Windows/WindowsHost.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index de2e7ff9bf..302545f190 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -159,6 +159,9 @@ void WindowsHost::SetWindowTitle(const char *message) { winTitle.append(ConvertUTF8ToWString(" - ")); winTitle.append(ConvertUTF8ToWString(message)); } +#ifdef _DEBUG + winTitle.append(L" (debug)"); +#endif MainWindow::SetWindowTitle(winTitle.c_str()); PostMessage(mainWindow_, MainWindow::WM_USER_WINDOW_TITLE_CHANGED, 0, 0); From a84a33678768c0724207c1258661d52b70f24441 Mon Sep 17 00:00:00 2001 From: LunaMoo Date: Mon, 13 Nov 2017 10:21:40 +0100 Subject: [PATCH 2/3] Nitpicking! Correct minor version for non Nvidia. --- ext/native/thin3d/thin3d_vulkan.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 8ceebbf3fa..0dd024b390 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -439,6 +439,7 @@ public: return StringFromFormat("%d.%d.%d.%d (%08x)", major, minor, secondaryBranch, tertiaryBranch, props.driverVersion); } else { uint32_t branch = props.driverVersion & 0xfff; + minor = (props.driverVersion >> 12) & 0x0ff; return StringFromFormat("%d.%d.%d (%08x)", major, minor, branch, props.driverVersion); } } From 6e20721587e15c50b582a3cad6793629145df2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 13 Nov 2017 10:22:30 +0100 Subject: [PATCH 3/3] Vulkan: Minor validation error fix --- GPU/Vulkan/StencilBufferVulkan.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GPU/Vulkan/StencilBufferVulkan.cpp b/GPU/Vulkan/StencilBufferVulkan.cpp index effbb8a779..29e379d9bc 100644 --- a/GPU/Vulkan/StencilBufferVulkan.cpp +++ b/GPU/Vulkan/StencilBufferVulkan.cpp @@ -170,7 +170,9 @@ bool FramebufferManagerVulkan::NotifyStencilUpload(u32 addr, int size, bool skip value = i; } renderManager->SetStencilParams(mask, 0xFF, 0xFF); - renderManager->PushConstants(vulkan2D_->GetPipelineLayout(), VK_SHADER_STAGE_FRAGMENT_BIT, 0, 4, &value); + // Need to specify both VERTEX and FRAGMENT bits here since that's what we set up in the pipeline layout, and we need + // that for the post shaders. There's probably not really a cost to this. + renderManager->PushConstants(vulkan2D_->GetPipelineLayout(), VK_SHADER_STAGE_VERTEX_BIT|VK_SHADER_STAGE_FRAGMENT_BIT, 0, 4, &value); renderManager->Draw(vulkan2D_->GetPipelineLayout(), descSet, 0, nullptr, VK_NULL_HANDLE, 0, 3); // full screen triangle }