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

Remove the global namespace a bit and remove some dead code.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7043 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-02-02 18:21:20 +00:00
parent 9a975705bf
commit 9c21d003af
67 changed files with 145 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -29,7 +29,6 @@
#include "VideoConfig.h"
#include "VertexLoaderManager.h"
#include "VertexShaderManager.h"
#include "XFBConvert.h"
#include "Core.h"
#include "DebuggerPanel.h"
@ -174,7 +173,6 @@ void VideoBackend::Initialize()
InitBackendInfo();
frameCount = 0;
InitXFBConvTables();
g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_dx11.ini").c_str());
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());

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

@ -49,7 +49,6 @@
#include "D3DUtil.h"
#include "EmuWindow.h"
#include "VideoState.h"
#include "XFBConvert.h"
#include "render.h"
#include "DLCache.h"
#include "IniFile.h"
@ -155,7 +154,6 @@ void VideoBackend::Initialize()
InitBackendInfo();
frameCount = 0;
InitXFBConvTables();
g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_dx9.ini").c_str());
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());

2
Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
View File

@ -30,7 +30,7 @@ if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(LIBS ${LIBS} Cg CgGL)
endif()
if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(LIBS ${LIBS} clrun)
endif()

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

@ -83,7 +83,6 @@ Make AA apply instantly during gameplay if possible
#include "PixelShaderManager.h"
#include "VertexShaderCache.h"
#include "VertexShaderManager.h"
#include "XFBConvert.h"
#include "CommandProcessor.h"
#include "PixelEngine.h"
#include "TextureConverter.h"
@ -98,9 +97,6 @@ Make AA apply instantly during gameplay if possible
#include "VideoBackend.h"
#include "ConfigManager.h"
// Logging
int GLScissorX, GLScissorY, GLScissorW, GLScissorH;
namespace OGL
{
@ -166,7 +162,6 @@ void VideoBackend::Initialize()
InitBackendInfo();
frameCount = 0;
InitXFBConvTables();
g_Config.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "gfx_opengl.ini").c_str());
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());

19
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
View File

@ -80,25 +80,6 @@ void OpenGL_SetWindowText(const char *text)
#endif
}
// Draw messages on top of the screen
unsigned int Callback_PeekMessages()
{
#ifdef _WIN32
// TODO: peekmessage
MSG msg;
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
{
if (msg.message == WM_QUIT)
return FALSE;
TranslateMessage(&msg);
DispatchMessage(&msg);
}
return TRUE;
#else
return FALSE;
#endif
}
// Show the current FPS
void UpdateFPSDisplay(const char *text)
{