From 74dac8aaaa13944b2e0908e9b9888ba9b8e90754 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 31 Jan 2011 00:57:09 +0000
Subject: [PATCH] fix compilation of dpsoftrast.c in MSVC - it doesn't seem to
 like initializers on __m128 variables - and set it to compile as C++ in wgl
 build (like all other files in wgl build)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10785 d7cf8633-e32d-0410-b094-e92efae38249
---
 darkplaces-wgl.vcproj | 16 ++++++++++++++++
 dpsoftrast.c          |  7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/darkplaces-wgl.vcproj b/darkplaces-wgl.vcproj
index 73dbd5a1..f36e472d 100644
--- a/darkplaces-wgl.vcproj
+++ b/darkplaces-wgl.vcproj
@@ -1239,6 +1239,14 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -1247,6 +1255,14 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\dpvsimpledecode.c"
diff --git a/dpsoftrast.c b/dpsoftrast.c
index 3ff70958..a6ef6f07 100644
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -3585,9 +3585,12 @@ void DPSOFTRAST_Draw_ProcessTriangles(int firstvertex, int numtriangles, const i
 #define SKIPBACKFACE \
 		if(cullface != GL_NONE) \
 		{ \
-			__m128 triangleedge[2] = { _mm_sub_ps(screen[0], screen[1]), _mm_sub_ps(screen[2], screen[1]) }; \
+			__m128 triangleedge[2]; \
+			__m128 trianglenormal; \
+			triangleedge[0] = _mm_sub_ps(screen[0], screen[1]); \
+			triangleedge[1] = _mm_sub_ps(screen[2], screen[1]); \
 			/* store normal in 2, 0, 1 order instead of 0, 1, 2 as it requires fewer shuffles and leaves z component accessible as scalar */ \
-			__m128 trianglenormal = _mm_sub_ss(_mm_mul_ss(triangleedge[0], _mm_shuffle_ps(triangleedge[1], triangleedge[1], _MM_SHUFFLE(3, 0, 2, 1))), \
+			trianglenormal = _mm_sub_ss(_mm_mul_ss(triangleedge[0], _mm_shuffle_ps(triangleedge[1], triangleedge[1], _MM_SHUFFLE(3, 0, 2, 1))), \
 											_mm_mul_ss(_mm_shuffle_ps(triangleedge[0], triangleedge[0], _MM_SHUFFLE(3, 0, 2, 1)), triangleedge[1])); \
 			/* apply current cullface mode (this culls many triangles) */ \
 			switch(cullface) \
-- 
2.39.2