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

compile fixes 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1683 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-26 11:33:32 +00:00
parent 67634d5a45
commit fa69ed2836
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
View File

@ -34,6 +34,7 @@
#include "VertexManager.h" #include "VertexManager.h"
#include "VertexLoader.h" #include "VertexLoader.h"
#include "XFMemory.h" #include "XFMemory.h"
#include "ImageWrite.h"
VertexShaderCache::VSCache VertexShaderCache::vshaders; VertexShaderCache::VSCache VertexShaderCache::vshaders;

12
Source/Plugins/Plugin_VideoOGL/Src/nmain.cpp
View File

@ -22,6 +22,11 @@
#include "Debugger/Debugger.h" // for the CDebugger class #include "Debugger/Debugger.h" // for the CDebugger class
#endif #endif
#if defined(HAVE_WX) && HAVE_WX
#include "GUI/ConfigDlg.h"
#include "Debugger/Debugger.h" // for the CDebugger class
#endif
#include "Config.h" #include "Config.h"
#include "LookUpTables.h" #include "LookUpTables.h"
#include "ImageWrite.h" #include "ImageWrite.h"
@ -34,7 +39,9 @@
#include "VertexLoader.h" #include "VertexLoader.h"
#include "VertexLoaderManager.h" #include "VertexLoaderManager.h"
#include "VertexManager.h" #include "VertexManager.h"
#include "PixelShaderCache.h"
#include "PixelShaderManager.h" #include "PixelShaderManager.h"
#include "VertexShaderCache.h"
#include "VertexShaderManager.h" #include "VertexShaderManager.h"
#include "XFB.h" #include "XFB.h"
#include "XFBConvert.h" #include "XFBConvert.h"
@ -146,7 +153,6 @@ void Video_DoState(unsigned char **ptr, int mode) {
void Video_Prepare(void) void Video_Prepare(void)
{ {
OpenGL_MakeCurrent(); OpenGL_MakeCurrent();
if (!Renderer::Init()) { if (!Renderer::Init()) {
g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE); g_VideoInitialize.pLog("Renderer::Create failed\n", TRUE);
PanicAlert("Can't create opengl renderer. You might be missing some required opengl extensions, check the logs for more info"); PanicAlert("Can't create opengl renderer. You might be missing some required opengl extensions, check the logs for more info");
@ -159,7 +165,9 @@ void Video_Prepare(void)
VertexManager::Init(); VertexManager::Init();
Fifo_Init(); // must be done before OpcodeDecoder_Init() Fifo_Init(); // must be done before OpcodeDecoder_Init()
OpcodeDecoder_Init(); OpcodeDecoder_Init();
VertexShaderCache::Init();
VertexShaderManager::Init(); VertexShaderManager::Init();
PixelShaderCache::Init();
PixelShaderManager::Init(); PixelShaderManager::Init();
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
VertexLoaderManager::Init(); VertexLoaderManager::Init();
@ -170,8 +178,10 @@ void Video_Shutdown(void)
{ {
TextureConverter::Shutdown(); TextureConverter::Shutdown();
VertexLoaderManager::Shutdown(); VertexLoaderManager::Shutdown();
VertexShaderCache::Shutdown();
VertexShaderManager::Shutdown(); VertexShaderManager::Shutdown();
PixelShaderManager::Shutdown(); PixelShaderManager::Shutdown();
PixelShaderCache::Shutdown();
Fifo_Shutdown(); Fifo_Shutdown();
VertexManager::Shutdown(); VertexManager::Shutdown();
TextureMngr::Shutdown(); TextureMngr::Shutdown();