id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-02-20 18:52:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more small changes for MinGW build

Browse source
This commit is contained in:
Daniel Gibson 2012-12-02 05:41:22 +01:00
parent 25e9e8bf1d
commit e738de183b
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/libs/jpeg-6/jmorecfg.h
View file

@ -150,8 +150,8 @@ typedef unsigned int UINT16;
#endif /* HAVE_UNSIGNED_SHORT */
#ifndef __MWERKS__
#ifndef _BASETSD_H_
typedef long INT32;
#if !defined(_BASETSD_H_) && !defined(_BASETSD_H)
typedef int INT32;
#endif
#endif

2
neo/renderer/DXT/DXTEncoder_SSE2.cpp
View file

@ -55,7 +55,7 @@ Contains the DxtEncoder implementation for SSE2.
typedef uint16 word;
typedef uint32 dword;
ALIGN16( static __m128i SIMD_SSE2_zero ) = { 0, 0, 0, 0 };
ALIGN16( static __m128i SIMD_SSE2_zero ) = _mm_set_epi32(0, 0, 0, 0);
ALIGN16( static dword SIMD_SSE2_dword_byte_mask[4] ) = { 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF };
ALIGN16( static dword SIMD_SSE2_dword_word_mask[4] ) = { 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF };
ALIGN16( static dword SIMD_SSE2_dword_red_mask[4] ) = { 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF };

2
neo/renderer/jobs/ShadowShared.cpp
View file

@ -131,7 +131,7 @@ static void R_ShadowVolumeCullBits( byte* cullBits, byte& totalOr, const float r
const __m128 p3Z = _mm_splat_ps( p3, 2 );
const __m128 p3W = _mm_splat_ps( p3, 3 );
__m128i vecTotalOrInt = { 0, 0, 0, 0 };
__m128i vecTotalOrInt = _mm_set_epi32(0, 0, 0, 0);
for( int i = 0; i < numVerts; )
{

7
neo/renderer/jobs/dynamicshadowvolume/DynamicShadowVolume.cpp
View file

@ -31,6 +31,9 @@ If you have questions concerning this license or the applicable additional terms
#include "../../../idlib/sys/sys_intrinsics.h"
#include "../../../idlib/geometry/DrawVert_intrinsics.h"
#ifdef _WIN32
#include <malloc.h> // DG: _alloca16 needs that
#endif
static const __m128i vector_int_neg_one = _mm_set_epi32( -1, -1, -1, -1 );
@ -39,7 +42,7 @@ static const __m128i vector_int_neg_one = _mm_set_epi32( -1, -1, -1, -1 );
TriangleFacing_SSE2
=====================
*/
static __forceinline __m128i TriangleFacing_SSE2( const __m128& vert0X, const __m128& vert0Y, const __m128& vert0Z,
static ID_FORCE_INLINE __m128i TriangleFacing_SSE2( const __m128& vert0X, const __m128& vert0Y, const __m128& vert0Z,
const __m128& vert1X, const __m128& vert1Y, const __m128& vert1Z,
const __m128& vert2X, const __m128& vert2Y, const __m128& vert2Z,
const __m128& lightOriginX, const __m128& lightOriginY, const __m128& lightOriginZ )
@ -68,7 +71,7 @@ TriangleCulled
The clip space of the 'lightProject' is assumed to be in the range [0, 1].
=====================
*/
static __forceinline __m128i TriangleCulled_SSE2( const __m128& vert0X, const __m128& vert0Y, const __m128& vert0Z,
static ID_FORCE_INLINE __m128i TriangleCulled_SSE2( const __m128& vert0X, const __m128& vert0Y, const __m128& vert0Z,
const __m128& vert1X, const __m128& vert1Y, const __m128& vert1Z,
const __m128& vert2X, const __m128& vert2Y, const __m128& vert2Z,
const __m128& lightProjectX, const __m128& lightProjectY, const __m128& lightProjectZ, const __m128& lightProjectW )

3
neo/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp
View file

@ -28,6 +28,9 @@ If you have questions concerning this license or the applicable additional terms
#include "PreLightShadowVolume_local.h"
#ifdef _WIN32 // DG: malloc.h needed for _alloca16
#include <malloc.h>
#endif
/*
===================
PreLightShadowVolumeJob