mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-12-23 10:01:20 -08:00
cmake: Always enable Vulkan
Removes the unnecesary burden of maintaining separate #ifdef paths and allows us sharing generic Vulkan code across APIs.
This commit is contained in:
parent
5836530a87
commit
1b9e08ab78
@ -24,8 +24,6 @@ option(YUZU_ENABLE_BOXCAT "Enable the Boxcat service, a yuzu high-level implemen
|
|||||||
|
|
||||||
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
|
||||||
|
|
||||||
option(ENABLE_VULKAN "Enables Vulkan backend" ON)
|
|
||||||
|
|
||||||
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
|
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
|
||||||
|
|
||||||
# Default to a Release build
|
# Default to a Release build
|
||||||
|
4
externals/CMakeLists.txt
vendored
4
externals/CMakeLists.txt
vendored
@ -61,9 +61,7 @@ if (USE_DISCORD_PRESENCE)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Sirit
|
# Sirit
|
||||||
if (ENABLE_VULKAN)
|
add_subdirectory(sirit)
|
||||||
add_subdirectory(sirit)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# libzip
|
# libzip
|
||||||
find_package(Libzip 1.5)
|
find_package(Libzip 1.5)
|
||||||
|
@ -115,6 +115,70 @@ add_library(video_core STATIC
|
|||||||
renderer_opengl/renderer_opengl.h
|
renderer_opengl/renderer_opengl.h
|
||||||
renderer_opengl/utils.cpp
|
renderer_opengl/utils.cpp
|
||||||
renderer_opengl/utils.h
|
renderer_opengl/utils.h
|
||||||
|
renderer_vulkan/fixed_pipeline_state.cpp
|
||||||
|
renderer_vulkan/fixed_pipeline_state.h
|
||||||
|
renderer_vulkan/maxwell_to_vk.cpp
|
||||||
|
renderer_vulkan/maxwell_to_vk.h
|
||||||
|
renderer_vulkan/nsight_aftermath_tracker.cpp
|
||||||
|
renderer_vulkan/nsight_aftermath_tracker.h
|
||||||
|
renderer_vulkan/renderer_vulkan.h
|
||||||
|
renderer_vulkan/renderer_vulkan.cpp
|
||||||
|
renderer_vulkan/vk_blit_screen.cpp
|
||||||
|
renderer_vulkan/vk_blit_screen.h
|
||||||
|
renderer_vulkan/vk_buffer_cache.cpp
|
||||||
|
renderer_vulkan/vk_buffer_cache.h
|
||||||
|
renderer_vulkan/vk_command_pool.cpp
|
||||||
|
renderer_vulkan/vk_command_pool.h
|
||||||
|
renderer_vulkan/vk_compute_pass.cpp
|
||||||
|
renderer_vulkan/vk_compute_pass.h
|
||||||
|
renderer_vulkan/vk_compute_pipeline.cpp
|
||||||
|
renderer_vulkan/vk_compute_pipeline.h
|
||||||
|
renderer_vulkan/vk_descriptor_pool.cpp
|
||||||
|
renderer_vulkan/vk_descriptor_pool.h
|
||||||
|
renderer_vulkan/vk_device.cpp
|
||||||
|
renderer_vulkan/vk_device.h
|
||||||
|
renderer_vulkan/vk_fence_manager.cpp
|
||||||
|
renderer_vulkan/vk_fence_manager.h
|
||||||
|
renderer_vulkan/vk_graphics_pipeline.cpp
|
||||||
|
renderer_vulkan/vk_graphics_pipeline.h
|
||||||
|
renderer_vulkan/vk_image.cpp
|
||||||
|
renderer_vulkan/vk_image.h
|
||||||
|
renderer_vulkan/vk_master_semaphore.cpp
|
||||||
|
renderer_vulkan/vk_master_semaphore.h
|
||||||
|
renderer_vulkan/vk_memory_manager.cpp
|
||||||
|
renderer_vulkan/vk_memory_manager.h
|
||||||
|
renderer_vulkan/vk_pipeline_cache.cpp
|
||||||
|
renderer_vulkan/vk_pipeline_cache.h
|
||||||
|
renderer_vulkan/vk_query_cache.cpp
|
||||||
|
renderer_vulkan/vk_query_cache.h
|
||||||
|
renderer_vulkan/vk_rasterizer.cpp
|
||||||
|
renderer_vulkan/vk_rasterizer.h
|
||||||
|
renderer_vulkan/vk_renderpass_cache.cpp
|
||||||
|
renderer_vulkan/vk_renderpass_cache.h
|
||||||
|
renderer_vulkan/vk_resource_pool.cpp
|
||||||
|
renderer_vulkan/vk_resource_pool.h
|
||||||
|
renderer_vulkan/vk_sampler_cache.cpp
|
||||||
|
renderer_vulkan/vk_sampler_cache.h
|
||||||
|
renderer_vulkan/vk_scheduler.cpp
|
||||||
|
renderer_vulkan/vk_scheduler.h
|
||||||
|
renderer_vulkan/vk_shader_decompiler.cpp
|
||||||
|
renderer_vulkan/vk_shader_decompiler.h
|
||||||
|
renderer_vulkan/vk_shader_util.cpp
|
||||||
|
renderer_vulkan/vk_shader_util.h
|
||||||
|
renderer_vulkan/vk_staging_buffer_pool.cpp
|
||||||
|
renderer_vulkan/vk_staging_buffer_pool.h
|
||||||
|
renderer_vulkan/vk_state_tracker.cpp
|
||||||
|
renderer_vulkan/vk_state_tracker.h
|
||||||
|
renderer_vulkan/vk_stream_buffer.cpp
|
||||||
|
renderer_vulkan/vk_stream_buffer.h
|
||||||
|
renderer_vulkan/vk_swapchain.cpp
|
||||||
|
renderer_vulkan/vk_swapchain.h
|
||||||
|
renderer_vulkan/vk_texture_cache.cpp
|
||||||
|
renderer_vulkan/vk_texture_cache.h
|
||||||
|
renderer_vulkan/vk_update_descriptor.cpp
|
||||||
|
renderer_vulkan/vk_update_descriptor.h
|
||||||
|
renderer_vulkan/wrapper.cpp
|
||||||
|
renderer_vulkan/wrapper.h
|
||||||
sampler_cache.cpp
|
sampler_cache.cpp
|
||||||
sampler_cache.h
|
sampler_cache.h
|
||||||
shader_cache.h
|
shader_cache.h
|
||||||
@ -194,75 +258,6 @@ add_library(video_core STATIC
|
|||||||
video_core.h
|
video_core.h
|
||||||
)
|
)
|
||||||
|
|
||||||
if (ENABLE_VULKAN)
|
|
||||||
target_sources(video_core PRIVATE
|
|
||||||
renderer_vulkan/fixed_pipeline_state.cpp
|
|
||||||
renderer_vulkan/fixed_pipeline_state.h
|
|
||||||
renderer_vulkan/maxwell_to_vk.cpp
|
|
||||||
renderer_vulkan/maxwell_to_vk.h
|
|
||||||
renderer_vulkan/nsight_aftermath_tracker.cpp
|
|
||||||
renderer_vulkan/nsight_aftermath_tracker.h
|
|
||||||
renderer_vulkan/renderer_vulkan.h
|
|
||||||
renderer_vulkan/renderer_vulkan.cpp
|
|
||||||
renderer_vulkan/vk_blit_screen.cpp
|
|
||||||
renderer_vulkan/vk_blit_screen.h
|
|
||||||
renderer_vulkan/vk_buffer_cache.cpp
|
|
||||||
renderer_vulkan/vk_buffer_cache.h
|
|
||||||
renderer_vulkan/vk_command_pool.cpp
|
|
||||||
renderer_vulkan/vk_command_pool.h
|
|
||||||
renderer_vulkan/vk_compute_pass.cpp
|
|
||||||
renderer_vulkan/vk_compute_pass.h
|
|
||||||
renderer_vulkan/vk_compute_pipeline.cpp
|
|
||||||
renderer_vulkan/vk_compute_pipeline.h
|
|
||||||
renderer_vulkan/vk_descriptor_pool.cpp
|
|
||||||
renderer_vulkan/vk_descriptor_pool.h
|
|
||||||
renderer_vulkan/vk_device.cpp
|
|
||||||
renderer_vulkan/vk_device.h
|
|
||||||
renderer_vulkan/vk_fence_manager.cpp
|
|
||||||
renderer_vulkan/vk_fence_manager.h
|
|
||||||
renderer_vulkan/vk_graphics_pipeline.cpp
|
|
||||||
renderer_vulkan/vk_graphics_pipeline.h
|
|
||||||
renderer_vulkan/vk_image.cpp
|
|
||||||
renderer_vulkan/vk_image.h
|
|
||||||
renderer_vulkan/vk_master_semaphore.cpp
|
|
||||||
renderer_vulkan/vk_master_semaphore.h
|
|
||||||
renderer_vulkan/vk_memory_manager.cpp
|
|
||||||
renderer_vulkan/vk_memory_manager.h
|
|
||||||
renderer_vulkan/vk_pipeline_cache.cpp
|
|
||||||
renderer_vulkan/vk_pipeline_cache.h
|
|
||||||
renderer_vulkan/vk_query_cache.cpp
|
|
||||||
renderer_vulkan/vk_query_cache.h
|
|
||||||
renderer_vulkan/vk_rasterizer.cpp
|
|
||||||
renderer_vulkan/vk_rasterizer.h
|
|
||||||
renderer_vulkan/vk_renderpass_cache.cpp
|
|
||||||
renderer_vulkan/vk_renderpass_cache.h
|
|
||||||
renderer_vulkan/vk_resource_pool.cpp
|
|
||||||
renderer_vulkan/vk_resource_pool.h
|
|
||||||
renderer_vulkan/vk_sampler_cache.cpp
|
|
||||||
renderer_vulkan/vk_sampler_cache.h
|
|
||||||
renderer_vulkan/vk_scheduler.cpp
|
|
||||||
renderer_vulkan/vk_scheduler.h
|
|
||||||
renderer_vulkan/vk_shader_decompiler.cpp
|
|
||||||
renderer_vulkan/vk_shader_decompiler.h
|
|
||||||
renderer_vulkan/vk_shader_util.cpp
|
|
||||||
renderer_vulkan/vk_shader_util.h
|
|
||||||
renderer_vulkan/vk_staging_buffer_pool.cpp
|
|
||||||
renderer_vulkan/vk_staging_buffer_pool.h
|
|
||||||
renderer_vulkan/vk_state_tracker.cpp
|
|
||||||
renderer_vulkan/vk_state_tracker.h
|
|
||||||
renderer_vulkan/vk_stream_buffer.cpp
|
|
||||||
renderer_vulkan/vk_stream_buffer.h
|
|
||||||
renderer_vulkan/vk_swapchain.cpp
|
|
||||||
renderer_vulkan/vk_swapchain.h
|
|
||||||
renderer_vulkan/vk_texture_cache.cpp
|
|
||||||
renderer_vulkan/vk_texture_cache.h
|
|
||||||
renderer_vulkan/vk_update_descriptor.cpp
|
|
||||||
renderer_vulkan/vk_update_descriptor.h
|
|
||||||
renderer_vulkan/wrapper.cpp
|
|
||||||
renderer_vulkan/wrapper.h
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
create_target_directory_groups(video_core)
|
create_target_directory_groups(video_core)
|
||||||
|
|
||||||
target_link_libraries(video_core PUBLIC common core)
|
target_link_libraries(video_core PUBLIC common core)
|
||||||
@ -278,12 +273,8 @@ endif()
|
|||||||
|
|
||||||
add_dependencies(video_core host_shaders)
|
add_dependencies(video_core host_shaders)
|
||||||
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
|
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
|
||||||
|
target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include)
|
||||||
if (ENABLE_VULKAN)
|
target_link_libraries(video_core PRIVATE sirit)
|
||||||
target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include)
|
|
||||||
target_compile_definitions(video_core PRIVATE HAS_VULKAN)
|
|
||||||
target_link_libraries(video_core PRIVATE sirit)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (ENABLE_NSIGHT_AFTERMATH)
|
if (ENABLE_NSIGHT_AFTERMATH)
|
||||||
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})
|
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})
|
||||||
|
@ -11,9 +11,7 @@
|
|||||||
#include "video_core/gpu_synch.h"
|
#include "video_core/gpu_synch.h"
|
||||||
#include "video_core/renderer_base.h"
|
#include "video_core/renderer_base.h"
|
||||||
#include "video_core/renderer_opengl/renderer_opengl.h"
|
#include "video_core/renderer_opengl/renderer_opengl.h"
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
#include "video_core/renderer_vulkan/renderer_vulkan.h"
|
#include "video_core/renderer_vulkan/renderer_vulkan.h"
|
||||||
#endif
|
|
||||||
#include "video_core/video_core.h"
|
#include "video_core/video_core.h"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
@ -28,11 +26,9 @@ std::unique_ptr<VideoCore::RendererBase> CreateRenderer(
|
|||||||
case Settings::RendererBackend::OpenGL:
|
case Settings::RendererBackend::OpenGL:
|
||||||
return std::make_unique<OpenGL::RendererOpenGL>(telemetry_session, emu_window, cpu_memory,
|
return std::make_unique<OpenGL::RendererOpenGL>(telemetry_session, emu_window, cpu_memory,
|
||||||
gpu, std::move(context));
|
gpu, std::move(context));
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
case Settings::RendererBackend::Vulkan:
|
case Settings::RendererBackend::Vulkan:
|
||||||
return std::make_unique<Vulkan::RendererVulkan>(telemetry_session, emu_window, cpu_memory,
|
return std::make_unique<Vulkan::RendererVulkan>(telemetry_session, emu_window, cpu_memory,
|
||||||
gpu, std::move(context));
|
gpu, std::move(context));
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
@ -219,7 +219,8 @@ target_link_libraries(yuzu PRIVATE common core input_common video_core)
|
|||||||
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets)
|
target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets)
|
||||||
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
|
||||||
|
|
||||||
if (ENABLE_VULKAN AND NOT WIN32)
|
target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
|
||||||
|
if (NOT WIN32)
|
||||||
target_include_directories(yuzu PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
target_include_directories(yuzu PRIVATE ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -280,8 +281,3 @@ endif()
|
|||||||
if (NOT APPLE)
|
if (NOT APPLE)
|
||||||
target_compile_definitions(yuzu PRIVATE HAS_OPENGL)
|
target_compile_definitions(yuzu PRIVATE HAS_OPENGL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_VULKAN)
|
|
||||||
target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
|
|
||||||
target_compile_definitions(yuzu PRIVATE HAS_VULKAN)
|
|
||||||
endif()
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <QOpenGLContext>
|
#include <QOpenGLContext>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(WIN32) && HAS_VULKAN
|
#if !defined(WIN32)
|
||||||
#include <qpa/qplatformnativeinterface.h>
|
#include <qpa/qplatformnativeinterface.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -241,14 +241,12 @@ private:
|
|||||||
std::unique_ptr<Core::Frontend::GraphicsContext> context;
|
std::unique_ptr<Core::Frontend::GraphicsContext> context;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
class VulkanRenderWidget : public RenderWidget {
|
class VulkanRenderWidget : public RenderWidget {
|
||||||
public:
|
public:
|
||||||
explicit VulkanRenderWidget(GRenderWindow* parent) : RenderWidget(parent) {
|
explicit VulkanRenderWidget(GRenderWindow* parent) : RenderWidget(parent) {
|
||||||
windowHandle()->setSurfaceType(QWindow::VulkanSurface);
|
windowHandle()->setSurfaceType(QWindow::VulkanSurface);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
static Core::Frontend::WindowSystemType GetWindowSystemType() {
|
static Core::Frontend::WindowSystemType GetWindowSystemType() {
|
||||||
// Determine WSI type based on Qt platform.
|
// Determine WSI type based on Qt platform.
|
||||||
@ -268,7 +266,6 @@ static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow*
|
|||||||
Core::Frontend::EmuWindow::WindowSystemInfo wsi;
|
Core::Frontend::EmuWindow::WindowSystemInfo wsi;
|
||||||
wsi.type = GetWindowSystemType();
|
wsi.type = GetWindowSystemType();
|
||||||
|
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
// Our Win32 Qt external doesn't have the private API.
|
// Our Win32 Qt external doesn't have the private API.
|
||||||
#if defined(WIN32) || defined(__APPLE__)
|
#if defined(WIN32) || defined(__APPLE__)
|
||||||
wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;
|
wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;
|
||||||
@ -281,7 +278,6 @@ static Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow*
|
|||||||
wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;
|
wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;
|
||||||
#endif
|
#endif
|
||||||
wsi.render_surface_scale = window ? static_cast<float>(window->devicePixelRatio()) : 1.0f;
|
wsi.render_surface_scale = window ? static_cast<float>(window->devicePixelRatio()) : 1.0f;
|
||||||
#endif
|
|
||||||
|
|
||||||
return wsi;
|
return wsi;
|
||||||
}
|
}
|
||||||
@ -598,18 +594,12 @@ bool GRenderWindow::InitializeOpenGL() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool GRenderWindow::InitializeVulkan() {
|
bool GRenderWindow::InitializeVulkan() {
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
auto child = new VulkanRenderWidget(this);
|
auto child = new VulkanRenderWidget(this);
|
||||||
child_widget = child;
|
child_widget = child;
|
||||||
child_widget->windowHandle()->create();
|
child_widget->windowHandle()->create();
|
||||||
main_context = std::make_unique<DummyContext>();
|
main_context = std::make_unique<DummyContext>();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
#else
|
|
||||||
QMessageBox::critical(this, tr("Vulkan not available!"),
|
|
||||||
tr("yuzu has not been compiled with Vulkan support."));
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GRenderWindow::LoadOpenGL() {
|
bool GRenderWindow::LoadOpenGL() {
|
||||||
|
@ -4,22 +4,17 @@
|
|||||||
|
|
||||||
#include <QColorDialog>
|
#include <QColorDialog>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
#include <QVulkanInstance>
|
#include <QVulkanInstance>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/settings.h"
|
#include "core/settings.h"
|
||||||
#include "ui_configure_graphics.h"
|
#include "ui_configure_graphics.h"
|
||||||
|
#include "video_core/renderer_vulkan/renderer_vulkan.h"
|
||||||
#include "yuzu/configuration/configuration_shared.h"
|
#include "yuzu/configuration/configuration_shared.h"
|
||||||
#include "yuzu/configuration/configure_graphics.h"
|
#include "yuzu/configuration/configure_graphics.h"
|
||||||
|
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
#include "video_core/renderer_vulkan/renderer_vulkan.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
|
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
|
||||||
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
|
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
|
||||||
vulkan_device = Settings::values.vulkan_device.GetValue();
|
vulkan_device = Settings::values.vulkan_device.GetValue();
|
||||||
@ -218,12 +213,10 @@ void ConfigureGraphics::UpdateDeviceComboBox() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureGraphics::RetrieveVulkanDevices() {
|
void ConfigureGraphics::RetrieveVulkanDevices() {
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
vulkan_devices.clear();
|
vulkan_devices.clear();
|
||||||
for (auto& name : Vulkan::RendererVulkan::EnumerateDevices()) {
|
for (const auto& name : Vulkan::RendererVulkan::EnumerateDevices()) {
|
||||||
vulkan_devices.push_back(QString::fromStdString(name));
|
vulkan_devices.push_back(QString::fromStdString(name));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const {
|
Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const {
|
||||||
|
@ -622,11 +622,6 @@ void GMainWindow::InitializeWidgets() {
|
|||||||
});
|
});
|
||||||
renderer_status_button->toggle();
|
renderer_status_button->toggle();
|
||||||
|
|
||||||
#ifndef HAS_VULKAN
|
|
||||||
renderer_status_button->setChecked(false);
|
|
||||||
renderer_status_button->setCheckable(false);
|
|
||||||
renderer_status_button->setDisabled(true);
|
|
||||||
#else
|
|
||||||
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
|
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
|
||||||
Settings::RendererBackend::Vulkan);
|
Settings::RendererBackend::Vulkan);
|
||||||
connect(renderer_status_button, &QPushButton::clicked, [this] {
|
connect(renderer_status_button, &QPushButton::clicked, [this] {
|
||||||
@ -641,7 +636,6 @@ void GMainWindow::InitializeWidgets() {
|
|||||||
|
|
||||||
Settings::Apply(Core::System::GetInstance());
|
Settings::Apply(Core::System::GetInstance());
|
||||||
});
|
});
|
||||||
#endif // HAS_VULKAN
|
|
||||||
statusBar()->insertPermanentWidget(0, renderer_status_button);
|
statusBar()->insertPermanentWidget(0, renderer_status_button);
|
||||||
|
|
||||||
statusBar()->setVisible(true);
|
statusBar()->setVisible(true);
|
||||||
@ -1254,9 +1248,7 @@ void GMainWindow::ShutdownGame() {
|
|||||||
emu_frametime_label->setVisible(false);
|
emu_frametime_label->setVisible(false);
|
||||||
async_status_button->setEnabled(true);
|
async_status_button->setEnabled(true);
|
||||||
multicore_status_button->setEnabled(true);
|
multicore_status_button->setEnabled(true);
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
renderer_status_button->setEnabled(true);
|
renderer_status_button->setEnabled(true);
|
||||||
#endif
|
|
||||||
|
|
||||||
emulation_running = false;
|
emulation_running = false;
|
||||||
|
|
||||||
@ -2545,10 +2537,8 @@ void GMainWindow::UpdateStatusButtons() {
|
|||||||
Settings::values.use_asynchronous_gpu_emulation.GetValue() ||
|
Settings::values.use_asynchronous_gpu_emulation.GetValue() ||
|
||||||
Settings::values.use_multi_core.GetValue());
|
Settings::values.use_multi_core.GetValue());
|
||||||
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
|
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
|
||||||
Settings::RendererBackend::Vulkan);
|
Settings::RendererBackend::Vulkan);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::UpdateUISettings() {
|
void GMainWindow::UpdateUISettings() {
|
||||||
|
@ -4,26 +4,17 @@ add_executable(yuzu-cmd
|
|||||||
config.cpp
|
config.cpp
|
||||||
config.h
|
config.h
|
||||||
default_ini.h
|
default_ini.h
|
||||||
emu_window/emu_window_sdl2_gl.cpp
|
|
||||||
emu_window/emu_window_sdl2_gl.h
|
|
||||||
emu_window/emu_window_sdl2.cpp
|
emu_window/emu_window_sdl2.cpp
|
||||||
emu_window/emu_window_sdl2.h
|
emu_window/emu_window_sdl2.h
|
||||||
emu_window/emu_window_sdl2_gl.cpp
|
emu_window/emu_window_sdl2_gl.cpp
|
||||||
emu_window/emu_window_sdl2_gl.h
|
emu_window/emu_window_sdl2_gl.h
|
||||||
|
emu_window/emu_window_sdl2_vk.cpp
|
||||||
|
emu_window/emu_window_sdl2_vk.h
|
||||||
resource.h
|
resource.h
|
||||||
yuzu.cpp
|
yuzu.cpp
|
||||||
yuzu.rc
|
yuzu.rc
|
||||||
)
|
)
|
||||||
|
|
||||||
if (ENABLE_VULKAN)
|
|
||||||
target_sources(yuzu-cmd PRIVATE
|
|
||||||
emu_window/emu_window_sdl2_vk.cpp
|
|
||||||
emu_window/emu_window_sdl2_vk.h)
|
|
||||||
|
|
||||||
target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
|
|
||||||
target_compile_definitions(yuzu-cmd PRIVATE HAS_VULKAN)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
create_target_directory_groups(yuzu-cmd)
|
create_target_directory_groups(yuzu-cmd)
|
||||||
|
|
||||||
target_link_libraries(yuzu-cmd PRIVATE common core input_common)
|
target_link_libraries(yuzu-cmd PRIVATE common core input_common)
|
||||||
@ -33,6 +24,8 @@ if (MSVC)
|
|||||||
endif()
|
endif()
|
||||||
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
|
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
|
||||||
|
|
||||||
|
target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
install(TARGETS yuzu-cmd RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
|
install(TARGETS yuzu-cmd RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
|
||||||
endif()
|
endif()
|
||||||
|
@ -35,9 +35,7 @@
|
|||||||
#include "yuzu_cmd/config.h"
|
#include "yuzu_cmd/config.h"
|
||||||
#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
|
#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
|
||||||
#include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h"
|
#include "yuzu_cmd/emu_window/emu_window_sdl2_gl.h"
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
|
#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// windows.h needs to be included before shellapi.h
|
// windows.h needs to be included before shellapi.h
|
||||||
@ -173,13 +171,8 @@ int main(int argc, char** argv) {
|
|||||||
emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, fullscreen);
|
emu_window = std::make_unique<EmuWindow_SDL2_GL>(&input_subsystem, fullscreen);
|
||||||
break;
|
break;
|
||||||
case Settings::RendererBackend::Vulkan:
|
case Settings::RendererBackend::Vulkan:
|
||||||
#ifdef HAS_VULKAN
|
|
||||||
emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem);
|
emu_window = std::make_unique<EmuWindow_SDL2_VK>(&input_subsystem);
|
||||||
break;
|
break;
|
||||||
#else
|
|
||||||
LOG_CRITICAL(Frontend, "Vulkan backend has not been compiled!");
|
|
||||||
return 1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
|
system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
|
||||||
|
Loading…
Reference in New Issue
Block a user