From 0556193442702d98ff2ba5db05f0d2a3effc26c8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 11 Oct 2013 21:45:44 -0500 Subject: [PATCH] Build fix for previous commit. --- Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp | 2 +- Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp | 3 ++- Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp index 52157c4a64..b2536f8404 100644 --- a/Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp @@ -49,7 +49,7 @@ void JitArmILAsmRoutineManager::Generate() Operand2 iCacheMask = Operand2(0xE, 2); // JIT_ICACHE_MASK BIC(R12, R12, iCacheMask); // R12 contains PC & JIT_ICACHE_MASK here. - MOVI2R(R14, (u32)jit->GetBlockCache()->GetICache()); + MOVI2R(R14, (u32)jit->GetBlockCache()->iCache); LDR(R12, R14, R12); // R12 contains iCache[PC & JIT_ICACHE_MASK] here // R12 Confirmed this is the correct iCache Location loaded. diff --git a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp index 93ac37ca6d..f890a40764 100644 --- a/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp @@ -7,6 +7,7 @@ #include "VertexShaderGen.h" #include "OnScreenDisplay.h" #include "GLFunctions.h" +#include "DriverDetails.h" #include "TextureConverter.h" #include "Render.h" @@ -66,7 +67,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms // Create EFB target. u32 depthType, rgbaType; - if (DriverDetails::HasBug(BUG_ISTEGRA)) + if (DriverDetails::HasBug(DriverDetails::BUG_ISTEGRA)) { depthType = GL_DEPTH_COMPONENT; rgbaType = GL_RGBA; diff --git a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp index 419a08f7a4..3c0db84ec1 100644 --- a/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp @@ -19,6 +19,7 @@ #include "Render.h" #include "FileUtil.h" #include "HW/Memmap.h" +#include "DriverDetails.h" namespace OGL { @@ -168,7 +169,7 @@ void Init() glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0); u32 rgbaType; - if (DriverDetails::HasBug(BUG_ISTEGRA)) + if (DriverDetails::HasBug(DriverDetails::BUG_ISTEGRA)) rgbaType = GL_RGBA; else rgbaType = GL_RGBA8;