dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-21 20:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add missing includes for MSVC

Browse source 
- MSVC doesn't provide C99 headers
- Default to min. req. 64Mb video mem if no COM present
- Move misplaced __attribute__((packed)) from MSVC to MinGW
This commit is contained in:
spiral 2011-12-21 23:08:10 +00:00 committed by Daniel Gibson
parent 092059bd95
commit 139726bc37
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
idlib/math/Simd_SSE.cpp
View file

@ -621,6 +621,13 @@ void VPCALL idSIMD_SSE::Dot( float *dst, const idVec3 &constant, const idPlane *
#include <xmmintrin.h>
#include "idlib/geometry/JointTransform.h"
#include "idlib/math/Vector.h"
#include "idlib/math/Matrix.h"
#include "idlib/math/Quat.h"
#include "idlib/math/Plane.h"
#include "renderer/Model.h"
#define SHUFFLEPS( x, y, z, w ) (( (x) & 3 ) << 6 | ( (y) & 3 ) << 4 | ( (z) & 3 ) << 2 | ( (w) & 3 ))
#define R_SHUFFLEPS( x, y, z, w ) (( (w) & 3 ) << 6 | ( (z) & 3 ) << 4 | ( (y) & 3 ) << 2 | ( (x) & 3 ))

3
idlib/math/Simd_SSE2.cpp
View file

@ -243,6 +243,9 @@ void VPCALL idSIMD_SSE2::CmpLT( byte *dst, const byte bitNum, const float *src0,
#include <xmmintrin.h>
#include "idlib/geometry/JointTransform.h"
#include "idlib/math/Math.h"
#define SHUFFLEPS( x, y, z, w ) (( (x) & 3 ) << 6 | ( (y) & 3 ) << 4 | ( (z) & 3 ) << 2 | ( (w) & 3 ))
#define R_SHUFFLEPS( x, y, z, w ) (( (w) & 3 ) << 6 | ( (z) & 3 ) << 4 | ( (y) & 3 ) << 2 | ( (x) & 3 ))
#define SHUFFLEPD( x, y ) (( (x) & 1 ) << 1 | ( (y) & 1 ))

4
idlib/math/Simd_SSE3.cpp
View file

@ -51,6 +51,10 @@ const char * idSIMD_SSE3::GetName( void ) const {
#include <xmmintrin.h>
#include "idlib/geometry/JointTransform.h"
#include "idlib/geometry/DrawVert.h"
#include "idlib/math/Vector.h"
#define SHUFFLEPS( x, y, z, w ) (( (x) & 3 ) << 6 | ( (y) & 3 ) << 4 | ( (z) & 3 ) << 2 | ( (w) & 3 ))
#define R_SHUFFLEPS( x, y, z, w ) (( (w) & 3 ) << 6 | ( (z) & 3 ) << 4 | ( (y) & 3 ) << 2 | ( (x) & 3 ))
#define SHUFFLEPD( x, y ) (( (x) & 1 ) << 1 | ( (y) & 1 ))

9
sys/platform.h
View file

@ -54,13 +54,13 @@ If you have questions concerning this license or the applicable additional terms
#ifdef _MSC_VER
#define ALIGN16( x ) __declspec(align(16)) x
#define PACKED __attribute__((packed))
#define PACKED
#define ID_INLINE __forceinline
#define ID_STATIC_TEMPLATE static
#define assertmem( x, y ) assert( _CrtIsValidPointer( x, y, true ) )
#else
#define ALIGN16( x ) x __attribute__ ((aligned (16)))
#define PACKED
#define PACKED __attribute__((packed))
#define ID_INLINE inline
#define ID_STATIC_TEMPLATE
#define assertmem( x, y )
@ -168,7 +168,10 @@ If you have questions concerning this license or the applicable additional terms
#define id_attribute(x)
#endif
#include <inttypes.h>
#if !defined(_MSC_VER)
// MSVC does not provide this C99 header
#include <inttypes.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>