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

Automated merge with https://hg.secondlife.com/mesh-development

meow-7.2.2
Nyx (Neal Orman) 2010-12-17 16:19:15 -05:00
parent ac7fad4cd0 089f9d6d37
commit fa17e848a6
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -171,6 +171,7 @@ blino Nakamura
VWR-17
Boroondas Gupte
CTS-320
CTS-323
SNOW-278
SNOW-503
SNOW-510

6
indra/llmath/llsimdmath.h
View File

@ -35,16 +35,18 @@
#error SSE2 not enabled. LLVector4a and related class will not compile.
#endif
#include <stdint.h>
template <typename T> T* LL_NEXT_ALIGNED_ADDRESS(T* address)
{
return reinterpret_cast<T*>(
(reinterpret_cast<U32>(address) + 0xF) & ~0xF);
(reinterpret_cast<uintptr_t>(address) + 0xF) & ~0xF);
}
template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address)
{
return reinterpret_cast<T*>(
(reinterpret_cast<U32>(address) + 0x3F) & ~0x3F);
(reinterpret_cast<uintptr_t>(address) + 0x3F) & ~0x3F);
}
#if LL_LINUX || LL_DARWIN

5
indra/llmath/llvolume.cpp
View File

@ -29,6 +29,7 @@
#include "llmath.h"
#include <set>
#include <stdint.h>
#include "llerror.h"
#include "llmemtype.h"
@ -90,10 +91,10 @@ const S32 SCULPT_MIN_AREA_DETAIL = 1;
extern BOOL gDebugGL;
void assert_aligned(void* ptr, U32 alignment)
void assert_aligned(void* ptr, uintptr_t alignment)
{
#if 0
U32 t = (U32) ptr;
uintptr_t t = (uintptr_t) ptr;
if (t%alignment != 0)
{
llerrs << "WTF?" << llendl;