Merge branch 'master' into TemporaryHackishBranch

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
 	}
 

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);

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);
 		}
 	}