livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missed a conflict marker in release-candidate to release merge.

master
James Cook 2007-07-11 22:23:21 +00:00
parent 35bcaa9655
commit 6502ae1ad8
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llmath/llv4math.h
View File

@ -65,18 +65,10 @@ typedef float V4F32 __attribute__((vector_size(16)));
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
<<<<<<< .mine
// Only VS2005 supports the _M_IX86_FP macro to indicate SSE compilation
// enabled. We assume that if you are using Visual Studio, and you include
// this file, you want SSE/vectorization code.
//#if LL_MSVC && _M_IX86_FP
#if LL_MSVC
=======
// Only vectorize if the entire Windows build uses SSE.
// _M_IX86_FP is set when SSE code generation is turned on, and I have
// confirmed this in VS2003, VS2003 SP1, and VS2005. JC
#if LL_MSVC && _M_IX86_FP
>>>>>>> .r65110
#define LL_VECTORIZE 1