mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-10 05:28:56 +02:00
barely-working VMA fix
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
parent
ec5ba51d91
commit
3f0a741ab1
4 changed files with 28 additions and 20 deletions
|
|
@ -9,7 +9,7 @@ include_directories(.)
|
||||||
|
|
||||||
if (ENABLE_UNITY_BUILD)
|
if (ENABLE_UNITY_BUILD)
|
||||||
set(CMAKE_UNITY_BUILD ON)
|
set(CMAKE_UNITY_BUILD ON)
|
||||||
set(CMAKE_UNITY_BUILD_BATCH_SIZE 5000)
|
set(CMAKE_UNITY_BUILD_BATCH_SIZE 100)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Dynarmic
|
# Dynarmic
|
||||||
|
|
|
||||||
|
|
@ -23,28 +23,28 @@ enum class SurfaceLoadStoreType : u64 {
|
||||||
_3D,
|
_3D,
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr unsigned R = 1 << 0;
|
constexpr unsigned SHADER_R = 1 << 0;
|
||||||
constexpr unsigned G = 1 << 1;
|
constexpr unsigned SHADER_G = 1 << 1;
|
||||||
constexpr unsigned B = 1 << 2;
|
constexpr unsigned SHADER_B = 1 << 2;
|
||||||
constexpr unsigned A = 1 << 3;
|
constexpr unsigned SHADER_A = 1 << 3;
|
||||||
|
|
||||||
constexpr std::array MASK{
|
constexpr std::array MASK{
|
||||||
0U, //
|
0U, //
|
||||||
R, //
|
SHADER_R, //
|
||||||
G, //
|
SHADER_G, //
|
||||||
R | G, //
|
SHADER_R | SHADER_G, //
|
||||||
B, //
|
SHADER_B, //
|
||||||
R | B, //
|
SHADER_R | SHADER_B, //
|
||||||
G | B, //
|
SHADER_G | SHADER_B, //
|
||||||
R | G | B, //
|
SHADER_R | SHADER_G | SHADER_B, //
|
||||||
A, //
|
SHADER_A, //
|
||||||
R | A, //
|
SHADER_R | SHADER_A, //
|
||||||
G | A, //
|
SHADER_G | SHADER_A, //
|
||||||
R | G | A, //
|
SHADER_R | SHADER_G | SHADER_A, //
|
||||||
B | A, //
|
SHADER_B | SHADER_A, //
|
||||||
R | B | A, //
|
SHADER_R | SHADER_B | SHADER_A, //
|
||||||
G | B | A, //
|
SHADER_G | SHADER_B | SHADER_A, //
|
||||||
R | G | B | A, //
|
SHADER_R | SHADER_G | SHADER_B | SHADER_A, //
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class SurfaceLoadStoreSize : u64 {
|
enum class SurfaceLoadStoreSize : u64 {
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,11 @@
|
||||||
|
|
||||||
#include "video_core/vulkan_common/vulkan.h"
|
#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_STATIC_VULKAN_FUNCTIONS 0
|
||||||
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
|
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
|
||||||
|
|
||||||
|
|
@ -19,3 +24,5 @@
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// #undef VMA_IMPLEMENTATION
|
||||||
|
|
|
||||||
|
|
@ -266,6 +266,7 @@ endif()
|
||||||
file(GLOB COMPAT_LIST
|
file(GLOB COMPAT_LIST
|
||||||
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
|
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
|
||||||
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
|
||||||
|
|
||||||
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*)
|
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*)
|
||||||
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*)
|
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue