ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Remove MSVC macro hack

This commit is contained in:
TheLastRar 2024-05-25 21:25:21 +01:00 committed by refractionpcsx2
parent c44659d3ab
commit f2e4a5e780
3 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/BuildParameters.cmake
View File

@ -112,6 +112,7 @@ if(MSVC AND NOT USE_CLANG_CL)
"$<$<COMPILE_LANGUAGE:CXX>:/Zc:externConstexpr>" "$<$<COMPILE_LANGUAGE:CXX>:/Zc:externConstexpr>"
"$<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>" "$<$<COMPILE_LANGUAGE:CXX>:/Zc:__cplusplus>"
"$<$<COMPILE_LANGUAGE:CXX>:/permissive->" "$<$<COMPILE_LANGUAGE:CXX>:/permissive->"
"$<$<COMPILE_LANGUAGE:CXX>:/Zc:preprocessor>"
"/Zo" "/Zo"
"/utf-8" "/utf-8"
) )

1
common/vsprops/common.props
View File

@ -43,6 +43,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
<!-- SH 2/3 flashlight, explicitly set here don't change --> <!-- SH 2/3 flashlight, explicitly set here don't change -->
<!-- https://github.com/PCSX2/pcsx2/commit/16431653e4d92fda4069031897e24fbe4688d36a --> <!-- https://github.com/PCSX2/pcsx2/commit/16431653e4d92fda4069031897e24fbe4688d36a -->

37
pcsx2/GS/Renderers/SW/GSNewCodeGenerator.h
View File

@ -91,10 +91,6 @@ public:
// ACTUAL_FORWARD_*: Actually forward the function of the given type // ACTUAL_FORWARD_*: Actually forward the function of the given type
// FORWARD#: First validates the arguments (e.g. make sure you're not passing registers over 7 on x86), then forwards to an ACTUAL_FORWARD_* // FORWARD#: First validates the arguments (e.g. make sure you're not passing registers over 7 on x86), then forwards to an ACTUAL_FORWARD_*
// Big thanks to https://stackoverflow.com/a/24028231 for helping me figure out how to work around MSVC's terrible macro expander
// Of course GCC/Clang don't like the workaround so enjoy the ifdefs
#define EXPAND_ARGS(macro, args) macro args
#define ACTUAL_FORWARD_BASE(name, ...) \ #define ACTUAL_FORWARD_BASE(name, ...) \
actual.name(__VA_ARGS__); actual.name(__VA_ARGS__);
@ -152,15 +148,9 @@ public:
ACTUAL_FORWARD_##category(name, a, b, c, d) \ ACTUAL_FORWARD_##category(name, a, b, c, d) \
} }
#if defined(__GNUC__) || (defined(_MSC_VER) && defined(__clang__)) #define FORWARD_(argcount, ...) FORWARD##argcount(__VA_ARGS__)
#define FORWARD_(argcount, ...) FORWARD##argcount(__VA_ARGS__) // Gets the macro evaluator to evaluate in the right order
// Gets the macro evaluator to evaluate in the right order #define FORWARD(...) FORWARD_(__VA_ARGS__)
#define FORWARD(...) FORWARD_(__VA_ARGS__)
#else
#define FORWARD_(argcount, ...) EXPAND_ARGS(FORWARD##argcount, (__VA_ARGS__))
// Gets the macro evaluator to evaluate in the right order
#define FORWARD(...) EXPAND_ARGS(FORWARD_, (__VA_ARGS__))
#endif
#define FORWARD_SSE_XMM0(name) \ #define FORWARD_SSE_XMM0(name) \
void name(const Xmm& a, const Operand& b) \ void name(const Xmm& a, const Operand& b) \
@ -180,21 +170,12 @@ public:
#define ADD_ONE_2 3 #define ADD_ONE_2 3
#define ADD_ONE_3 4 #define ADD_ONE_3 4
#if defined(__GNUC__) || defined(_MSC_VER) && defined(__clang__) #define SFORWARD(argcount, name, ...) FORWARD(argcount, SSE, name, __VA_ARGS__)
#define SFORWARD(argcount, name, ...) FORWARD(argcount, SSE, name, __VA_ARGS__) #define AFORWARD_(argcount, name, arg1, ...) \
#define AFORWARD_(argcount, name, arg1, ...) \ SFORWARD(argcount, name, arg1, __VA_ARGS__) \
SFORWARD(argcount, name, arg1, __VA_ARGS__) \ FORWARD(ADD_ONE_##argcount, AVX, v##name, arg1, arg1, __VA_ARGS__)
FORWARD(ADD_ONE_##argcount, AVX, v##name, arg1, arg1, __VA_ARGS__) // Gets the macro evaluator to evaluate in the right order
// Gets the macro evaluator to evaluate in the right order #define AFORWARD(...) AFORWARD_(__VA_ARGS__)
#define AFORWARD(...) EXPAND_ARGS(AFORWARD_, (__VA_ARGS__))
#else
#define SFORWARD(argcount, name, ...) EXPAND_ARGS(FORWARD, (argcount, SSE, name, __VA_ARGS__))
#define AFORWARD_(argcount, name, arg1, ...) \
EXPAND_ARGS(SFORWARD, (argcount, name, arg1, __VA_ARGS__)) \
EXPAND_ARGS(FORWARD, (ADD_ONE_##argcount, AVX, v##name, arg1, arg1, __VA_ARGS__))
// Gets the macro evaluator to evaluate in the right order
#define AFORWARD(...) EXPAND_ARGS(AFORWARD_, (__VA_ARGS__))
#endif
#define FORWARD_OO_OI(name) \ #define FORWARD_OO_OI(name) \
FORWARD(2, BASE, name, ARGS_OO) \ FORWARD(2, BASE, name, ARGS_OO) \