Browse Source
barely-working VMA fix
Signed-off-by: crueter <crueter@eden-emu.dev>
lizzie/unity-build
crueter
4 days ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
28 additions and
20 deletions
-
src/CMakeLists.txt
-
src/shader_recompiler/frontend/maxwell/translate/impl/surface_load_store.cpp
-
src/video_core/vulkan_common/vma.h
-
src/yuzu/CMakeLists.txt
|
|
|
@ -9,7 +9,7 @@ include_directories(.) |
|
|
|
|
|
|
|
if (ENABLE_UNITY_BUILD) |
|
|
|
set(CMAKE_UNITY_BUILD ON) |
|
|
|
set(CMAKE_UNITY_BUILD_BATCH_SIZE 5000) |
|
|
|
set(CMAKE_UNITY_BUILD_BATCH_SIZE 100) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Dynarmic |
|
|
|
|
|
|
|
@ -23,28 +23,28 @@ enum class SurfaceLoadStoreType : u64 { |
|
|
|
_3D, |
|
|
|
}; |
|
|
|
|
|
|
|
constexpr unsigned R = 1 << 0; |
|
|
|
constexpr unsigned G = 1 << 1; |
|
|
|
constexpr unsigned B = 1 << 2; |
|
|
|
constexpr unsigned A = 1 << 3; |
|
|
|
constexpr unsigned SHADER_R = 1 << 0; |
|
|
|
constexpr unsigned SHADER_G = 1 << 1; |
|
|
|
constexpr unsigned SHADER_B = 1 << 2; |
|
|
|
constexpr unsigned SHADER_A = 1 << 3; |
|
|
|
|
|
|
|
constexpr std::array MASK{ |
|
|
|
0U, //
|
|
|
|
R, //
|
|
|
|
G, //
|
|
|
|
R | G, //
|
|
|
|
B, //
|
|
|
|
R | B, //
|
|
|
|
G | B, //
|
|
|
|
R | G | B, //
|
|
|
|
A, //
|
|
|
|
R | A, //
|
|
|
|
G | A, //
|
|
|
|
R | G | A, //
|
|
|
|
B | A, //
|
|
|
|
R | B | A, //
|
|
|
|
G | B | A, //
|
|
|
|
R | G | B | A, //
|
|
|
|
SHADER_R, //
|
|
|
|
SHADER_G, //
|
|
|
|
SHADER_R | SHADER_G, //
|
|
|
|
SHADER_B, //
|
|
|
|
SHADER_R | SHADER_B, //
|
|
|
|
SHADER_G | SHADER_B, //
|
|
|
|
SHADER_R | SHADER_G | SHADER_B, //
|
|
|
|
SHADER_A, //
|
|
|
|
SHADER_R | SHADER_A, //
|
|
|
|
SHADER_G | SHADER_A, //
|
|
|
|
SHADER_R | SHADER_G | SHADER_A, //
|
|
|
|
SHADER_B | SHADER_A, //
|
|
|
|
SHADER_R | SHADER_B | SHADER_A, //
|
|
|
|
SHADER_G | SHADER_B | SHADER_A, //
|
|
|
|
SHADER_R | SHADER_G | SHADER_B | SHADER_A, //
|
|
|
|
}; |
|
|
|
|
|
|
|
enum class SurfaceLoadStoreSize : u64 { |
|
|
|
|
|
|
|
@ -7,6 +7,11 @@ |
|
|
|
|
|
|
|
#include "video_core/vulkan_common/vulkan.h" |
|
|
|
|
|
|
|
// #if !defined(VMA_IMPLEMENTATION) && !defined(VMA_IMPLEMENTED) |
|
|
|
// #define VMA_IMPLEMENTED |
|
|
|
// #define VMA_IMPLEMENTATION |
|
|
|
// #endif |
|
|
|
|
|
|
|
#define VMA_STATIC_VULKAN_FUNCTIONS 0 |
|
|
|
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 |
|
|
|
|
|
|
|
@ -19,3 +24,5 @@ |
|
|
|
#ifdef _MSC_VER |
|
|
|
#pragma warning( pop ) |
|
|
|
#endif |
|
|
|
|
|
|
|
// #undef VMA_IMPLEMENTATION |
|
|
|
@ -266,6 +266,7 @@ endif() |
|
|
|
file(GLOB COMPAT_LIST |
|
|
|
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc |
|
|
|
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) |
|
|
|
|
|
|
|
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*) |
|
|
|
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*) |
|
|
|
|
|
|
|
|
