ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for previous commit.

This commit is contained in:
Ryan Houdek 2013-10-11 21:45:44 -05:00
parent cf7521dc36
commit 0556193442
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/PowerPC/JitArmIL/JitILAsm.cpp
View File

@ -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.

3
Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
View File

@ -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;

3
Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
View File

@ -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;