octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renderer_vulkan: Fix surface creation

Browse Source
This commit is contained in:
emufan
2022-07-04 11:54:01 +03:00
parent bbb4f1b040
commit b1b61683f2
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video_core/renderer_vulkan/renderer_vulkan.cpp
View File

@@ -62,11 +62,10 @@ vk::SurfaceKHR CreateSurface(const vk::Instance& instance,
vk::SurfaceKHR surface; vk::SurfaceKHR surface;
#if VK_USE_PLATFORM_WIN32_KHR #if VK_USE_PLATFORM_WIN32_KHR
if (window_info.type == Core::Frontend::WindowSystemType::Windows) { if (window_info.type == Frontend::WindowSystemType::Windows) {
const HWND hWnd = static_cast<HWND>(window_info.render_surface); const HWND hWnd = static_cast<HWND>(window_info.render_surface);
const VkWin32SurfaceCreateInfoKHR win32_ci{VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR, const vk::Win32SurfaceCreateInfoKHR win32_ci{{}, nullptr, hWnd};
nullptr, 0, nullptr, hWnd}; if (instandce.createWin32SurfaceKHR(&win32_ci, nullptr, &surface) != vk::Result::eSuccess) {
if (vkCreateWin32SurfaceKHR(instance, &win32_ci, nullptr, &unsafe_surface) != VK_SUCCESS) {
LOG_ERROR(Render_Vulkan, "Failed to initialize Win32 surface"); LOG_ERROR(Render_Vulkan, "Failed to initialize Win32 surface");
UNREACHABLE(); UNREACHABLE();
} }
@@ -84,11 +83,10 @@ vk::SurfaceKHR CreateSurface(const vk::Instance& instance,
#elif VK_USE_PLATFORM_WAYLAND_KHR #elif VK_USE_PLATFORM_WAYLAND_KHR
if (window_info.type == Frontend::WindowSystemType::Wayland) { if (window_info.type == Frontend::WindowSystemType::Wayland) {
const VkWaylandSurfaceCreateInfoKHR wayland_ci{ const vk::WaylandSurfaceCreateInfoKHR wayland_ci{{},
VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR, nullptr, 0,
static_cast<wl_display*>(window_info.display_connection), static_cast<wl_display*>(window_info.display_connection),
static_cast<wl_surface*>(window_info.render_surface)}; static_cast<wl_surface*>(window_info.render_surface)};
if (vkCreateWaylandSurfaceKHR(instance, &wayland_ci, nullptr, &unsafe_surface) != VK_SUCCESS) { if (instance.createWaylandSurfaceKHR(&wayland_ci, nullptr, &surface) != vk::Result::eSuccess) {
LOG_ERROR(Render_Vulkan, "Failed to initialize Wayland surface"); LOG_ERROR(Render_Vulkan, "Failed to initialize Wayland surface");
UNREACHABLE(); UNREACHABLE();
} }
@@ -418,11 +416,6 @@ void RendererVulkan::DrawScreens(const Layout::FramebufferLayout& layout, bool f
draw_info.modelview = glm::transpose(glm::ortho(0.f, static_cast<float>(layout.width), draw_info.modelview = glm::transpose(glm::ortho(0.f, static_cast<float>(layout.width),
static_cast<float>(layout.height), 0.0f, static_cast<float>(layout.height), 0.0f,
0.f, 1.f)); 0.f, 1.f));
const bool stereo_single_screen = false
/* Settings::values.render_3d == Settings::StereoRenderOption::Anaglyph ||
Settings::values.render_3d == Settings::StereoRenderOption::Interlaced ||
Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced*/;
auto& image = swapchain->GetCurrentImage(); auto& image = swapchain->GetCurrentImage();
auto& state = VulkanState::Get(); auto& state = VulkanState::Get();