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

pcsx2/GSdx: disable AVX for the moment on linux 

I need to check carefully the consequence of ABI change. So far wx is very unhappy!

Fatal Error: Mismatch between the program and library build versions detected.
The library used 2.8 (no debug,Unicode,compiler with C++ ABI 1002,wx containers,compatible with 2.6),
and your program used 2.8 (no debug,Unicode,compiler with C++ ABI 1006,wx containers,compatible with 2.6).
This commit is contained in:
Gregory Hainaut 2014-11-09 15:45:54 +01:00
parent 84f844767c
commit ec1da2805c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/BuildParameters.cmake
View File

@ -64,7 +64,7 @@ option(USE_ASAN "Enable address sanitizer")
# Select the architecture
#-------------------------------------------------------------------------------
option(64BIT_BUILD_DONT_WORK "Enable a x86_64 build instead of cross compiling (WARNING: NOTHING WORK)" OFF)
option(DISABLE_ADVANCE_SIMD "Disable advance use of SIMD (SSE2+ & AVX)" OFF)
option(DISABLE_ADVANCE_SIMD "Disable advance use of SIMD (SSE2+ & AVX)" ON)
# Architecture bitness detection
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@ -103,7 +103,8 @@ if(_ARCH_64 AND 64BIT_BUILD_DONT_WORK)
if (DISABLE_ADVANCE_SIMD)
set(ARCH_FLAG "-m64 -msse -msse2")
else()
set(ARCH_FLAG "-m64 -march=native -fabi-version=6")
#set(ARCH_FLAG "-m64 -march=native -fabi-version=6")
set(ARCH_FLAG "-m64 -march=native")
endif()
add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1)
set(_ARCH_64 1)
@ -137,7 +138,8 @@ else()
else()
# AVX requires some fix of the ABI (mangling) (default 2)
# Note: V6 requires GCC 4.7
set(ARCH_FLAG "-m32 -march=native -fabi-version=6")
#set(ARCH_FLAG "-m32 -march=native -fabi-version=6")
set(ARCH_FLAG "-m32 -march=native")
endif()
add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1)
set(_ARCH_32 1)

6
plugins/GSdx/GSVector.h
View File

@ -2970,15 +2970,15 @@ public:
}
template<int i> __forceinline int extract32() const
template<int idx> __forceinline int extract32() const
{
#if _M_SSE >= 0x401
return _mm_extract_ps(m, i);
return _mm_extract_ps(m, idx);
#else
return i32[i];
return i32[idx];
#endif
}