Merge pull request #359 from shuffle2/d3d-disable-warnings-as-errors

D3D: Don't pass D3D10_SHADER_WARNINGS_ARE_ERRORS to the compiler in debug builds.
dolphin-emu · May 11, 2014 · 541ff4c · 541ff4c
2 parents 454919b + 17577af
commit 541ff4c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Core/VideoBackends/D3D/D3DShader.cpp b/Source/Core/VideoBackends/D3D/D3DShader.cpp
@@ -32,7 +32,7 @@ bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
 	ID3D10Blob* errorBuffer = nullptr;
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG;
 #else
 	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
 #endif
@@ -89,7 +89,7 @@ bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
 	ID3D10Blob* errorBuffer = nullptr;
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
+	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG;
 #else
 	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
 #endif
@@ -149,7 +149,7 @@ bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
 	ID3D10Blob* errorBuffer = nullptr;
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	UINT flags = D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
+	UINT flags = D3D10_SHADER_DEBUG;
 #else
 	UINT flags = D3D10_SHADER_OPTIMIZATION_LEVEL3;
 #endif