CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

frontend: qt: bootmanager: Vulkan: Restore support for VK backend.

merge-requests/60/head
bunnei 2020-02-17 21:29:12 +07:00
parent 14877b8f35
commit e25297536f
5 changed files with 150 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video_core/renderer_vulkan/renderer_vulkan.cpp
Unescape Escape View File

@ -106,8 +106,14 @@ RendererVulkan::~RendererVulkan() {
} }
void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) { void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
render_window.PollEvents();
if (!framebuffer) {
return;
}
const auto& layout = render_window.GetFramebufferLayout(); const auto& layout = render_window.GetFramebufferLayout();
if (framebuffer && layout.width > 0 && layout.height > 0 && render_window.IsShown()) { if (layout.width > 0 && layout.height > 0 && render_window.IsShown()) {
const VAddr framebuffer_addr = framebuffer->address + framebuffer->offset; const VAddr framebuffer_addr = framebuffer->address + framebuffer->offset;
const bool use_accelerated = const bool use_accelerated =
rasterizer->AccelerateDisplay(*framebuffer, framebuffer_addr, framebuffer->stride); rasterizer->AccelerateDisplay(*framebuffer, framebuffer_addr, framebuffer->stride);
@ -128,13 +134,16 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
blit_screen->Recreate(); blit_screen->Recreate();
} }
render_window.SwapBuffers();
rasterizer->TickFrame(); rasterizer->TickFrame();
} }
render_window.PollEvents(); render_window.PollEvents();
} }
void RendererVulkan::TryPresent(int /*timeout_ms*/) {
// TODO (bunnei): ImplementMe
}
bool RendererVulkan::Init() { bool RendererVulkan::Init() {
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr{}; PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr{};
render_window.RetrieveVulkanHandlers(&vkGetInstanceProcAddr, &instance, &surface); render_window.RetrieveVulkanHandlers(&vkGetInstanceProcAddr, &instance, &surface);
@ -262,4 +271,4 @@ void RendererVulkan::Report() const {
telemetry_session.AddField(field, "GPU_Vulkan_Extensions", extensions); telemetry_session.AddField(field, "GPU_Vulkan_Extensions", extensions);
} }
} // namespace Vulkan } // namespace Vulkan

8
src/video_core/renderer_vulkan/renderer_vulkan.h
Unescape Escape View File

@ -36,14 +36,10 @@ public:
explicit RendererVulkan(Core::Frontend::EmuWindow& window, Core::System& system); explicit RendererVulkan(Core::Frontend::EmuWindow& window, Core::System& system);
~RendererVulkan() override; ~RendererVulkan() override;
/// Swap buffers (render frame)
void SwapBuffers(const Tegra::FramebufferConfig* framebuffer) override;
/// Initialize the renderer
bool Init() override; bool Init() override;
/// Shutdown the renderer
void ShutDown() override; void ShutDown() override;
void SwapBuffers(const Tegra::FramebufferConfig* framebuffer) override;
void TryPresent(int timeout_ms) override;
private: private:
std::optional<vk::DebugUtilsMessengerEXT> CreateDebugCallback( std::optional<vk::DebugUtilsMessengerEXT> CreateDebugCallback(

215
src/yuzu/bootmanager.cpp
Unescape Escape View File

@ -147,88 +147,129 @@ private:
QOffscreenSurface* surface; QOffscreenSurface* surface;
}; };
OpenGLWindow::OpenGLWindow(QWindow* parent, QWidget* event_handler, QOpenGLContext* shared_context) class ChildRenderWindow : public QWindow {
: QWindow(parent), event_handler(event_handler), public:
context(new QOpenGLContext(shared_context->parent())) { ChildRenderWindow(QWindow* parent, QWidget* event_handler)
: QWindow{parent}, event_handler{event_handler} {}
// disable vsync for any shared contexts virtual ~ChildRenderWindow() = default;
auto format = shared_context->format();
format.setSwapInterval(Settings::values.use_vsync ? 1 : 0);
this->setFormat(format);
context->setShareContext(shared_context); virtual void Present() = 0;
context->setScreen(this->screen());
context->setFormat(format);
context->create();
setSurfaceType(QWindow::OpenGLSurface); protected:
bool event(QEvent* event) override {
// TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, switch (event->type()) {
// WA_DontShowOnScreen, WA_DeleteOnClose case QEvent::UpdateRequest:
} Present();
return true;
OpenGLWindow::~OpenGLWindow() { case QEvent::MouseButtonPress:
context->doneCurrent(); case QEvent::MouseButtonRelease:
} case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
void OpenGLWindow::Present() { case QEvent::KeyPress:
if (!isExposed()) case QEvent::KeyRelease:
return; case QEvent::FocusIn:
case QEvent::FocusOut:
context->makeCurrent(this); case QEvent::FocusAboutToChange:
Core::System::GetInstance().Renderer().TryPresent(100); case QEvent::Enter:
context->swapBuffers(this); case QEvent::Leave:
auto f = context->versionFunctions<QOpenGLFunctions_4_3_Core>(); case QEvent::Wheel:
f->glFinish(); case QEvent::TabletMove:
QWindow::requestUpdate(); case QEvent::TabletPress:
} case QEvent::TabletRelease:
case QEvent::TabletEnterProximity:
bool OpenGLWindow::event(QEvent* event) { case QEvent::TabletLeaveProximity:
switch (event->type()) { case QEvent::TouchBegin:
case QEvent::UpdateRequest: case QEvent::TouchUpdate:
Present(); case QEvent::TouchEnd:
return true; case QEvent::InputMethodQuery:
case QEvent::MouseButtonPress: case QEvent::TouchCancel:
case QEvent::MouseButtonRelease: return QCoreApplication::sendEvent(event_handler, event);
case QEvent::MouseButtonDblClick: case QEvent::Drop:
case QEvent::MouseMove: GetMainWindow()->DropAction(static_cast<QDropEvent*>(event));
case QEvent::KeyPress: return true;
case QEvent::KeyRelease: case QEvent::DragResponse:
case QEvent::FocusIn: case QEvent::DragEnter:
case QEvent::FocusOut: case QEvent::DragLeave:
case QEvent::FocusAboutToChange: case QEvent::DragMove:
case QEvent::Enter: GetMainWindow()->AcceptDropEvent(static_cast<QDropEvent*>(event));
case QEvent::Leave: return true;
case QEvent::Wheel: default:
case QEvent::TabletMove: return QWindow::event(event);
case QEvent::TabletPress: }
case QEvent::TabletRelease:
case QEvent::TabletEnterProximity:
case QEvent::TabletLeaveProximity:
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
case QEvent::InputMethodQuery:
case QEvent::TouchCancel:
return QCoreApplication::sendEvent(event_handler, event);
case QEvent::Drop:
GetMainWindow()->DropAction(static_cast<QDropEvent*>(event));
return true;
case QEvent::DragResponse:
case QEvent::DragEnter:
case QEvent::DragLeave:
case QEvent::DragMove:
GetMainWindow()->AcceptDropEvent(static_cast<QDropEvent*>(event));
return true;
default:
return QWindow::event(event);
} }
}
void OpenGLWindow::exposeEvent(QExposeEvent* event) { void exposeEvent(QExposeEvent* event) override {
QWindow::requestUpdate(); QWindow::requestUpdate();
QWindow::exposeEvent(event); QWindow::exposeEvent(event);
} }
private:
QWidget* event_handler{};
};
class OpenGLWindow final : public ChildRenderWindow {
public:
OpenGLWindow(QWindow* parent, QWidget* event_handler, QOpenGLContext* shared_context)
: ChildRenderWindow{parent, event_handler},
context(new QOpenGLContext(shared_context->parent())) {
// disable vsync for any shared contexts
auto format = shared_context->format();
format.setSwapInterval(Settings::values.use_vsync ? 1 : 0);
this->setFormat(format);
context->setShareContext(shared_context);
context->setScreen(this->screen());
context->setFormat(format);
context->create();
setSurfaceType(QWindow::OpenGLSurface);
// TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground,
// WA_DontShowOnScreen, WA_DeleteOnClose
}
~OpenGLWindow() override {
context->doneCurrent();
}
void Present() override {
if (!isExposed()) {
return;
}
context->makeCurrent(this);
Core::System::GetInstance().Renderer().TryPresent(100);
context->swapBuffers(this);
auto f = context->versionFunctions<QOpenGLFunctions_4_3_Core>();
f->glFinish();
QWindow::requestUpdate();
}
private:
QOpenGLContext* context{};
};
#ifdef HAS_VULKAN
class VulkanWindow final : public ChildRenderWindow {
public:
VulkanWindow(QWindow* parent, QWidget* event_handler, QVulkanInstance* instance)
: ChildRenderWindow{parent, event_handler} {
setSurfaceType(QSurface::SurfaceType::VulkanSurface);
setVulkanInstance(instance);
}
~VulkanWindow() override = default;
void Present() override {
// TODO(bunnei): ImplementMe
}
private:
QWidget* event_handler{};
};
#endif
GRenderWindow::GRenderWindow(QWidget* parent_, EmuThread* emu_thread) GRenderWindow::GRenderWindow(QWidget* parent_, EmuThread* emu_thread)
: QWidget(parent_), emu_thread(emu_thread) { : QWidget(parent_), emu_thread(emu_thread) {
@ -251,11 +292,15 @@ GRenderWindow::~GRenderWindow() {
} }
void GRenderWindow::MakeCurrent() { void GRenderWindow::MakeCurrent() {
core_context->MakeCurrent(); if (core_context) {
core_context->MakeCurrent();
}
} }
void GRenderWindow::DoneCurrent() { void GRenderWindow::DoneCurrent() {
core_context->DoneCurrent(); if (core_context) {
core_context->DoneCurrent();
}
} }
void GRenderWindow::PollEvents() { void GRenderWindow::PollEvents() {
@ -274,7 +319,7 @@ void GRenderWindow::RetrieveVulkanHandlers(void* get_instance_proc_addr, void* i
#ifdef HAS_VULKAN #ifdef HAS_VULKAN
const auto instance_proc_addr = vk_instance->getInstanceProcAddr("vkGetInstanceProcAddr"); const auto instance_proc_addr = vk_instance->getInstanceProcAddr("vkGetInstanceProcAddr");
const VkInstance instance_copy = vk_instance->vkInstance(); const VkInstance instance_copy = vk_instance->vkInstance();
const VkSurfaceKHR surface_copy = vk_instance->surfaceForWindow(child); const VkSurfaceKHR surface_copy = vk_instance->surfaceForWindow(child_window);
std::memcpy(get_instance_proc_addr, &instance_proc_addr, sizeof(instance_proc_addr)); std::memcpy(get_instance_proc_addr, &instance_proc_addr, sizeof(instance_proc_addr));
std::memcpy(instance, &instance_copy, sizeof(instance_copy)); std::memcpy(instance, &instance_copy, sizeof(instance_copy));
@ -535,7 +580,6 @@ bool GRenderWindow::InitializeOpenGL() {
layout()->addWidget(child_widget); layout()->addWidget(child_widget);
core_context = CreateSharedContext(); core_context = CreateSharedContext();
resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
return true; return true;
} }
@ -565,7 +609,14 @@ bool GRenderWindow::InitializeVulkan() {
return false; return false;
} }
child = new GVKWidgetInternal(this, vk_instance.get()); GMainWindow* parent = GetMainWindow();
QWindow* parent_win_handle = parent ? parent->windowHandle() : nullptr;
child_window = new VulkanWindow(parent_win_handle, this, vk_instance.get());
child_window->create();
child_widget = createWindowContainer(child_window, this);
child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
layout()->addWidget(child_widget);
return true; return true;
#else #else
QMessageBox::critical(this, tr("Vulkan not available!"), QMessageBox::critical(this, tr("Vulkan not available!"),

26
src/yuzu/bootmanager.h
Unescape Escape View File

@ -27,14 +27,6 @@ class QOpenGLContext;
class QVulkanInstance; class QVulkanInstance;
#endif #endif
class GWidgetInternal;
class GGLWidgetInternal;
class GVKWidgetInternal;
class GMainWindow;
class GRenderWindow;
class QSurface;
class QOpenGLContext;
namespace VideoCore { namespace VideoCore {
enum class LoadCallbackStage; enum class LoadCallbackStage;
} }
@ -123,24 +115,6 @@ signals:
void LoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total); void LoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total);
}; };
class OpenGLWindow : public QWindow {
Q_OBJECT
public:
explicit OpenGLWindow(QWindow* parent, QWidget* event_handler, QOpenGLContext* shared_context);
~OpenGLWindow();
void Present();
protected:
bool event(QEvent* event) override;
void exposeEvent(QExposeEvent* event) override;
private:
QOpenGLContext* context;
QWidget* event_handler;
};
class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow { class GRenderWindow : public QWidget, public Core::Frontend::EmuWindow {
Q_OBJECT Q_OBJECT

4
src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
Unescape Escape View File

@ -160,4 +160,6 @@ bool EmuWindow_SDL2_VK::UseStandardLayers(PFN_vkGetInstanceProcAddr vkGetInstanc
}) != layers.end(); }) != layers.end();
} }
void EmuWindow_SDL2_VK::Present() {} void EmuWindow_SDL2_VK::Present() {
// TODO (bunnei): ImplementMe
}