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

gsdx: disable simd in 64 bits 

Let's concentrate first on SSE2

This commit fuses a couple of ifdef
This commit is contained in:
Gregory Hainaut 2016-01-14 20:02:52 +01:00
parent 76230c1305
commit 35568f6425
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/GSdx/stdafx.h
View File

@ -120,10 +120,6 @@ using namespace std;
using namespace stdext; using namespace stdext;
#endif #endif
#ifdef __linux__
#include <sys/stat.h> // mkdir
#endif
#ifdef _WINDOWS #ifdef _WINDOWS
// Note use GL/glcorearb.h on the future // Note use GL/glcorearb.h on the future
@ -195,6 +191,8 @@ using namespace stdext;
#include <GL/glext.h> #include <GL/glext.h>
#include "GLLoader.h" #include "GLLoader.h"
#include <sys/stat.h> // mkdir
#define DIRECTORY_SEPARATOR '/' #define DIRECTORY_SEPARATOR '/'
#endif #endif
@ -206,6 +204,8 @@ using namespace stdext;
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type __stdcall #define EXPORT_C_(type) extern "C" __declspec(dllexport) type __stdcall
#define EXPORT_C EXPORT_C_(void) #define EXPORT_C EXPORT_C_(void)
#define ALIGN_STACK(n) __aligned(int, n) __dummy;
#else #else
#define __aligned(t, n) t __attribute__((aligned(n))) #define __aligned(t, n) t __attribute__((aligned(n)))
@ -221,8 +221,18 @@ using namespace stdext;
// #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) // #define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__))
#define __assume(c) do { if (!(c)) __builtin_unreachable(); } while(0) #define __assume(c) do { if (!(c)) __builtin_unreachable(); } while(0)
// GCC removes the variable as dead code and generates some warnings.
// Stack is automatically realigned due to SSE/AVX operations
#define ALIGN_STACK(n) (void)0;
#else
// TODO Check clang behavior
#define ALIGN_STACK(n) __aligned(int, n) __dummy;
#endif #endif
#endif #endif
extern string format(const char* fmt, ...); extern string format(const char* fmt, ...);
@ -236,14 +246,6 @@ struct aligned_free_second {template<class T> void operator()(T& p) {_aligned_fr
#define countof(a) (sizeof(a) / sizeof(a[0])) #define countof(a) (sizeof(a) / sizeof(a[0]))
// GCC removes the variable as dead code and generates some warnings.
// Stack is automatically realigned due to SSE/AVX operations
#ifdef __GNUC__
#define ALIGN_STACK(n) (void)0;
#else
#define ALIGN_STACK(n) __aligned(int, n) __dummy;
#endif
#ifndef RESTRICT #ifndef RESTRICT
#ifdef __INTEL_COMPILER #ifdef __INTEL_COMPILER
@ -284,7 +286,7 @@ struct aligned_free_second {template<class T> void operator()(T& p) {_aligned_fr
#endif #endif
// sse // sse
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(__x86_64__)
// Convert gcc see define into GSdx (windows) define // Convert gcc see define into GSdx (windows) define
#if defined(__AVX2__) #if defined(__AVX2__)
#define _M_SSE 0x501 #define _M_SSE 0x501
@ -301,6 +303,7 @@ struct aligned_free_second {template<class T> void operator()(T& p) {_aligned_fr
#elif defined(__SSE__) #elif defined(__SSE__)
#define _M_SSE 0x100 #define _M_SSE 0x100
#endif #endif
#endif #endif
#if !defined(_M_SSE) && (!defined(_WINDOWS) || defined(_M_AMD64) || defined(_M_IX86_FP) && _M_IX86_FP >= 2) #if !defined(_M_SSE) && (!defined(_WINDOWS) || defined(_M_AMD64) || defined(_M_IX86_FP) && _M_IX86_FP >= 2)