From 73d2b3e9684da5eb43280b7facbf2f31d584a75b Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 13 Sep 2009 10:18:01 +0000 Subject: more uninteresting cleanup, fixed a minor race condition when toggling efb copy mode git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4261 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/Src/VertexShaderManager.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index cfaf4b74ef..b19fb54a8a 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "Common.h" +#include "VideoConfig.h" #include "MathUtil.h" #include "Profiler.h" @@ -216,9 +217,8 @@ void VertexShaderManager::SetConstants() if (xfregs.rawProjection[6] == 0) { - bool bWidescreenHack = Projection_GetWidescreen(); // Perspective - g_fProjectionMatrix[0] = (bWidescreenHack ? xfregs.rawProjection[0]*0.75f : xfregs.rawProjection[0]); + g_fProjectionMatrix[0] = (g_ActiveConfig.bWidescreenHack ? xfregs.rawProjection[0]*0.75f : xfregs.rawProjection[0]); g_fProjectionMatrix[1] = 0.0f; g_fProjectionMatrix[2] = xfregs.rawProjection[1]; g_fProjectionMatrix[3] = 0.0f; @@ -313,7 +313,7 @@ void VertexShaderManager::SetConstants() PRIM_LOG("Projection: %f %f %f %f %f %f\n", xfregs.rawProjection[0], xfregs.rawProjection[1], xfregs.rawProjection[2], xfregs.rawProjection[3], xfregs.rawProjection[4], xfregs.rawProjection[5]); - if (Projection_GetFreeLook()) + if (g_ActiveConfig.bFreeLook) { Matrix44 mtxA; Matrix44 mtxB; -- cgit v1.2.3