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

GS: Fix some defines

This commit is contained in:
TellowKrinkle 2021-06-20 22:44:29 -05:00 committed by Kojin
parent d2d5fcf07a
commit 2849f0bc81
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/GS/GS.h
View File

@ -324,18 +324,6 @@ extern void fifo_free(void* ptr, size_t size, size_t repeat);
extern const std::string root_sw; extern const std::string root_sw;
extern const std::string root_hw; extern const std::string root_hw;
#ifndef __has_attribute
# define __has_attribute(x) 0
#endif
#ifdef __cpp_constinit
# define CONSTINIT constinit
#elif __has_attribute(require_constant_initialization)
# define CONSTINIT __attribute__((require_constant_initialization))
#else
# define CONSTINIT
#endif
// MacOS headers define PAGE_SIZE to the size of an x86 page // MacOS headers define PAGE_SIZE to the size of an x86 page
#ifdef PAGE_SIZE #ifdef PAGE_SIZE
# undef PAGE_SIZE # undef PAGE_SIZE

14
pcsx2/GS/GS_types.h
View File

@ -92,8 +92,14 @@ extern void vmfree(void* ptr, size_t size);
#define countof(a) (sizeof(a) / sizeof(a[0])) #define countof(a) (sizeof(a) / sizeof(a[0]))
#ifndef __has_attribute
#define __has_attribute(x) 0
#endif
#ifdef __cpp_constinit #ifdef __cpp_constinit
#define CONSTINIT constinit #define CONSTINIT constinit
#elif __has_attribute(require_constant_initialization)
#define CONSTINIT __attribute__((require_constant_initialization))
#else #else
#define CONSTINIT #define CONSTINIT
#endif #endif
@ -114,12 +120,12 @@ extern void vmfree(void* ptr, size_t size);
#define _M_SSE 0x500 #define _M_SSE 0x500
#elif defined(__SSE4_1__) #elif defined(__SSE4_1__)
#define _M_SSE 0x401 #define _M_SSE 0x401
#else
#error PCSX2 requires compiling for at least SSE 4.1
#endif #endif
#endif #elif _M_SSE < 0x401
#if !defined(_M_SSE) && (!defined(_WIN32) || defined(_M_AMD64) || defined(_M_IX86_FP) && _M_IX86_FP >= 2) #error PCSX2 requires compiling for at least SSE 4.1
#define _M_SSE 0x401
#endif #endif