hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

early-access version 3789

Browse Source
This commit is contained in:
pineappleEA
2023-08-02 22:24:25 +02:00
parent 50fe0298ee
commit b8064464d8
17 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,7 +1,7 @@
yuzu emulator early access
=============
This is the source code for early-access 3788.
This is the source code for early-access 3789.
## Legal Notice

3
src/video_core/renderer_vulkan/blit_image.cpp
View File

@@ -3,6 +3,8 @@
#include <algorithm>
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "common/settings.h"
#include "video_core/host_shaders/blit_color_float_frag_spv.h"
#include "video_core/host_shaders/convert_abgr8_to_d24s8_frag_spv.h"
@@ -19,7 +21,6 @@
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_shader_util.h"
#include "video_core/renderer_vulkan/vk_state_tracker.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "video_core/renderer_vulkan/vk_update_descriptor.h"
#include "video_core/surface.h"
#include "video_core/vulkan_common/vulkan_device.h"

3
src/video_core/renderer_vulkan/renderer_vulkan.h
View File

@@ -7,11 +7,12 @@
#include <string>
#include <variant>
#include "video_core/renderer_vulkan/vk_rasterizer.h"
#include "common/dynamic_library.h"
#include "video_core/renderer_base.h"
#include "video_core/renderer_vulkan/vk_blit_screen.h"
#include "video_core/renderer_vulkan/vk_present_manager.h"
#include "video_core/renderer_vulkan/vk_rasterizer.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_state_tracker.h"
#include "video_core/renderer_vulkan/vk_swapchain.h"

3
src/video_core/renderer_vulkan/vk_buffer_cache.cpp
View File

@@ -7,8 +7,9 @@
#include <span>
#include <vector>
#include "video_core/renderer_vulkan/maxwell_to_vk.h"
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
#include "video_core/renderer_vulkan/maxwell_to_vk.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
#include "video_core/renderer_vulkan/vk_update_descriptor.h"

3
src/video_core/renderer_vulkan/vk_compute_pass.cpp
View File

@@ -6,6 +6,8 @@
#include <optional>
#include <utility>
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/div_ceil.h"
@@ -16,7 +18,6 @@
#include "video_core/renderer_vulkan/vk_descriptor_pool.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "video_core/renderer_vulkan/vk_update_descriptor.h"
#include "video_core/texture_cache/accelerated_swizzle.h"
#include "video_core/texture_cache/types.h"

3
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@@ -7,9 +7,10 @@
#include <boost/container/small_vector.hpp>
#include <boost/container/static_vector.hpp>
#include "video_core/renderer_vulkan/pipeline_helper.h"
#include "common/bit_field.h"
#include "video_core/renderer_vulkan/maxwell_to_vk.h"
#include "video_core/renderer_vulkan/pipeline_helper.h"
#include "video_core/renderer_vulkan/pipeline_statistics.h"
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
#include "video_core/renderer_vulkan/vk_graphics_pipeline.h"

3
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@@ -6,6 +6,8 @@
#include <memory>
#include <mutex>
#include "video_core/renderer_vulkan/renderer_vulkan.h"
#include "common/assert.h"
#include "common/logging/log.h"
#include "common/microprofile.h"
@@ -18,7 +20,6 @@
#include "video_core/renderer_vulkan/blit_image.h"
#include "video_core/renderer_vulkan/fixed_pipeline_state.h"
#include "video_core/renderer_vulkan/maxwell_to_vk.h"
#include "video_core/renderer_vulkan/renderer_vulkan.h"
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
#include "video_core/renderer_vulkan/vk_compute_pipeline.h"
#include "video_core/renderer_vulkan/vk_descriptor_pool.h"

3
src/video_core/renderer_vulkan/vk_rasterizer.h
View File

@@ -7,13 +7,14 @@
#include <boost/container/static_vector.hpp>
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
#include "common/common_types.h"
#include "video_core/control/channel_state_cache.h"
#include "video_core/engines/maxwell_dma.h"
#include "video_core/rasterizer_accelerated.h"
#include "video_core/rasterizer_interface.h"
#include "video_core/renderer_vulkan/blit_image.h"
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
#include "video_core/renderer_vulkan/vk_descriptor_pool.h"
#include "video_core/renderer_vulkan/vk_fence_manager.h"
#include "video_core/renderer_vulkan/vk_pipeline_cache.h"

3
src/video_core/renderer_vulkan/vk_scheduler.cpp
View File

@@ -6,11 +6,12 @@
#include <thread>
#include <utility>
#include "video_core/renderer_vulkan/vk_query_cache.h"
#include "common/microprofile.h"
#include "common/thread.h"
#include "video_core/renderer_vulkan/vk_command_pool.h"
#include "video_core/renderer_vulkan/vk_master_semaphore.h"
#include "video_core/renderer_vulkan/vk_query_cache.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_state_tracker.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h"

3
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@@ -11,6 +11,8 @@
#include "common/bit_util.h"
#include "common/settings.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "video_core/engines/fermi_2d.h"
#include "video_core/renderer_vulkan/blit_image.h"
#include "video_core/renderer_vulkan/maxwell_to_vk.h"
@@ -18,7 +20,6 @@
#include "video_core/renderer_vulkan/vk_render_pass_cache.h"
#include "video_core/renderer_vulkan/vk_scheduler.h"
#include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
#include "video_core/renderer_vulkan/vk_texture_cache.h"
#include "video_core/texture_cache/formatter.h"
#include "video_core/texture_cache/samples_helper.h"
#include "video_core/texture_cache/util.h"

3
src/video_core/renderer_vulkan/vk_texture_cache.h
View File

@@ -5,11 +5,12 @@
#include <span>
#include "video_core/texture_cache/texture_cache_base.h"
#include "shader_recompiler/shader_info.h"
#include "video_core/renderer_vulkan/vk_compute_pass.h"
#include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
#include "video_core/texture_cache/image_view_base.h"
#include "video_core/texture_cache/texture_cache_base.h"
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"

13
src/video_core/vulkan_common/vulkan.h
View File

@@ -8,6 +8,19 @@
#define VK_USE_PLATFORM_WIN32_KHR
#elif defined(__APPLE__)
#define VK_USE_PLATFORM_METAL_EXT
#elif defined(__ANDROID__)
#define VK_USE_PLATFORM_ANDROID_KHR
#else
#define VK_USE_PLATFORM_XLIB_KHR
#define VK_USE_PLATFORM_WAYLAND_KHR
#endif
#include <vulkan/vulkan.h>
// Sanitize macros
#undef CreateEvent
#undef CreateSemaphore
#undef Always
#undef False
#undef None
#undef True

13
src/video_core/vulkan_common/vulkan_instance.cpp
View File

@@ -14,19 +14,6 @@
#include "video_core/vulkan_common/vulkan_instance.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
// Include these late to avoid polluting previous headers
#if defined(_WIN32)
#include <windows.h>
// ensure include order
#include <vulkan/vulkan_win32.h>
#elif defined(__ANDROID__)
#include <vulkan/vulkan_android.h>
#elif !defined(__APPLE__)
#include <X11/Xlib.h>
#include <vulkan/vulkan_wayland.h>
#include <vulkan/vulkan_xlib.h>
#endif
namespace Vulkan {
namespace {

13
src/video_core/vulkan_common/vulkan_surface.cpp
View File

@@ -6,19 +6,6 @@
#include "video_core/vulkan_common/vulkan_surface.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
// Include these late to avoid polluting previous headers
#ifdef _WIN32
#include <windows.h>
// ensure include order
#include <vulkan/vulkan_win32.h>
#elif defined(__ANDROID__)
#include <vulkan/vulkan_android.h>
#elif !defined(__APPLE__)
#include <X11/Xlib.h>
#include <vulkan/vulkan_wayland.h>
#include <vulkan/vulkan_xlib.h>
#endif
namespace Vulkan {
vk::SurfaceKHR CreateSurface(

8
src/video_core/vulkan_common/vulkan_wrapper.h
View File

@@ -15,14 +15,6 @@
#include "common/common_types.h"
#include "video_core/vulkan_common/vulkan.h"
// Sanitize macros
#ifdef CreateEvent
#undef CreateEvent
#endif
#ifdef CreateSemaphore
#undef CreateSemaphore
#endif
#ifdef _MSC_VER
#pragma warning(disable : 26812) // Disable prefer enum class over enum
#endif

9
src/yuzu/configuration/config.cpp
View File

@@ -727,8 +727,7 @@ void Config::ReadMultiplayerValues() {
}
void Config::ReadNetworkValues() {
qt_config->beginGroup(
QString::fromUtf8(Settings::TranslateCategory(Settings::Category::Network)));
qt_config->beginGroup(QString::fromStdString("Services"));
ReadCategory(Settings::Category::Network);
@@ -1271,9 +1270,11 @@ void Config::ReadSettingGeneric(Settings::BasicSetting* const setting) {
}
if (global || !use_global) {
const bool is_default = ReadSetting(name + QStringLiteral("/default"), true).value<bool>();
const bool is_default =
qt_config->value(name + QStringLiteral("/default"), true).value<bool>();
if (!is_default) {
setting->LoadString(ReadSetting(name, default_value).value<QString>().toStdString());
setting->LoadString(
qt_config->value(name, default_value).value<QString>().toStdString());
} else {
// Empty string resets the Setting to default
setting->LoadString("");

4
src/yuzu/vk_device_info.cpp
View File

@@ -3,6 +3,9 @@
#include <utility>
#include <vector>
#include "yuzu/qt_common.h"
#include "common/dynamic_library.h"
#include "common/logging/log.h"
#include "video_core/vulkan_common/vulkan_device.h"
@@ -11,7 +14,6 @@
#include "video_core/vulkan_common/vulkan_surface.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
#include "vulkan/vulkan_core.h"
#include "yuzu/qt_common.h"
#include "yuzu/vk_device_info.h"
class QWindow;