aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-19 05:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SSE2: Fix for MinGW

Browse source
This commit is contained in:
kaetemi 2014-06-19 00:05:43 +02:00
parent 75b167d8a6
commit bd16b94047
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/misc/fixed_size_allocator.h
View file

@ -53,8 +53,8 @@ public:
uint getNumAllocatedBlocks() const { return _NumAlloc; } uint getNumAllocatedBlocks() const { return _NumAlloc; }
private: private:
class CChunk; class CChunk;
NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT)
class CNode class NL_ALIGN(NL_DEFAULT_MEMORY_ALIGNMENT) CNode
{ {
public: public:
CChunk *Chunk; // the Chunk this node belongs to. CChunk *Chunk; // the Chunk this node belongs to.

4
code/nel/include/nel/misc/matrix.h
View file

@ -53,8 +53,8 @@ class CPlane;
* \author Nevrax France * \author Nevrax France
* \date 2000 * \date 2000
*/ */
NL_ALIGN_SSE2
class CMatrix class NL_ALIGN_SSE2 CMatrix
{ {
public: public:
/// Rotation Order. /// Rotation Order.

7
code/nel/include/nel/misc/types_nl.h
View file

@ -342,7 +342,7 @@ typedef unsigned int uint; // at least 32bits (depend of processor)
// #ifdef NL_ENABLE_FORCE_INLINE // #ifdef NL_ENABLE_FORCE_INLINE
# ifdef NL_COMP_VC # ifdef NL_COMP_VC
# define NL_FORCE_INLINE __forceinline # define NL_FORCE_INLINE __forceinline
# elif NL_COMP_GCC # elif defined(NL_COMP_GCC)
# define NL_FORCE_INLINE inline __attribute__((always_inline)) # define NL_FORCE_INLINE inline __attribute__((always_inline))
# else # else
# define NL_FORCE_INLINE inline # define NL_FORCE_INLINE inline
@ -358,7 +358,10 @@ typedef unsigned int uint; // at least 32bits (depend of processor)
#define NL_ALIGN(nb) __attribute__((aligned(nb))) #define NL_ALIGN(nb) __attribute__((aligned(nb)))
#endif #endif
#ifdef NL_COMP_VC #ifdef NL_OS_WINDOWS
#include <stdlib.h>
#include <intrin.h>
#include <malloc.h>
inline void *aligned_malloc(size_t size, size_t alignment) { return _aligned_malloc(size, alignment); } inline void *aligned_malloc(size_t size, size_t alignment) { return _aligned_malloc(size, alignment); }
inline void aligned_free(void *ptr) { _aligned_free(ptr); } inline void aligned_free(void *ptr) { _aligned_free(ptr); }
#else #else

9
code/nel/src/misc/matrix.cpp
View file

@ -140,6 +140,11 @@ inline void CMatrix::testExpandRot() const
self->Scale33= 1; self->Scale33= 1;
} }
} }
void CMatrix::testExpandRotEx() const
{
testExpandRot();
}
inline void CMatrix::testExpandProj() const inline void CMatrix::testExpandProj() const
{ {
if(hasProj()) if(hasProj())
@ -151,6 +156,10 @@ inline void CMatrix::testExpandProj() const
self->a41=0; self->a42=0; self->a43=0; self->a44=1; self->a41=0; self->a42=0; self->a43=0; self->a44=1;
} }
} }
void CMatrix::testExpandProjEx() const
{
testExpandProj();
}
// ====================================================================================================== // ======================================================================================================