piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'arm-noglsl'

Browse Source
This commit is contained in:
Ryan Houdek
2013-02-27 02:22:08 +00:00
parent a680d17eef be7643cd2d
commit 692e39d1bb
135 changed files with 9278 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
View File

@ -19,7 +19,7 @@
#include "D3DBase.h"
#include "x64Emitter.h"
#include "ABI.h"
#include "x64ABI.h"
#include "MemoryUtil.h"
#include "VertexShaderGen.h"

4
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -51,7 +51,9 @@ void VideoBackend::UpdateFPSDisplay(const char *text)
}
void InitInterface()
{
#if defined(USE_EGL) && USE_EGL
#ifdef ANDROID
GLInterface = new cInterfaceBase;
#elif defined(USE_EGL) && USE_EGL
GLInterface = new cInterfaceEGL;
#elif defined(USE_WX) && USE_WX
GLInterface = new cInterfaceWX;

2
Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
View File

@ -17,7 +17,7 @@
#include "GLUtil.h"
#include "x64Emitter.h"
#include "ABI.h"
#include "x64ABI.h"
#include "MemoryUtil.h"
#include "VertexShaderGen.h"

4
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -204,7 +204,9 @@ void VideoBackend::Video_Prepare()
GL_REPORT_ERRORD();
VertexLoaderManager::Init();
TextureConverter::Init();
#ifndef _M_GENERIC
DLCache::Init();
#endif
// Notify the core that the video backend is ready
Host_Message(WM_USER_CREATE);
@ -219,7 +221,9 @@ void VideoBackend::Shutdown()
s_efbAccessRequested = false;
s_FifoShuttingDown = false;
s_swapRequested = false;
#ifndef _M_GENERIC
DLCache::Shutdown();
#endif
Fifo_Shutdown();
PostProcessing::Shutdown();

6
Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
View File

@ -125,7 +125,9 @@ void DecodeStandard(u32 bufferSize)
if (Cmd == GX_NOP)
return;
// Causes a SIGBUS error on Android
// XXX: Investigate
#ifndef ANDROID
// check if switching in or out of an object
// only used for debuggging
if (inObjectStream && (Cmd & 0x87) != lastPrimCmd)
@ -139,7 +141,7 @@ void DecodeStandard(u32 bufferSize)
lastPrimCmd = Cmd & 0x87;
DebugUtil::OnObjectBegin();
}
#endif
switch(Cmd)
{
case GX_NOP:

6
Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
View File

@ -115,15 +115,15 @@ void RunGpu()
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
{
// We are going to do FP math on the main thread so have to save the current state
SaveSSEState();
LoadDefaultSSEState();
FPURoundMode::SaveSIMDState();
FPURoundMode::LoadDefaultSIMDState();
// run the opcode decoder
do {
RunBuffer();
} while (cpreg.ctrl.GPReadEnable && !AtBreakpoint() && cpreg.readptr != cpreg.writeptr);
LoadSSEState();
FPURoundMode::LoadSIMDState();
}
}