diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
| commit | 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch) | |
| tree | f89014544fc276b283a36eb2e0cb52e93806a44a /indra/llmath | |
| parent | a6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff) | |
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llv4math.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llmath/llv4math.h b/indra/llmath/llv4math.h index f064b39947..65d3aa5b71 100644 --- a/indra/llmath/llv4math.h +++ b/indra/llmath/llv4math.h @@ -1,5 +1,5 @@ /** - * @file llviewerjointmesh.cpp + * @file llv4math.h * @brief LLV4* class header file - vector processor enabled math * * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. @@ -65,10 +65,18 @@ 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 |