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

more uninteresting cleanup, fixed a minor race condition when toggling efb copy mode

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4261 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-09-13 10:18:01 +00:00
parent 2d93c654f0
commit 73d2b3e968
12 changed files with 30 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -65,8 +65,9 @@ bool Renderer::Init()
UpdateActiveConfig();
EmuWindow::SetSize(g_Res[g_ActiveConfig.iWindowedRes][0], g_Res[g_ActiveConfig.iWindowedRes][1]);
int backbuffer_ms_mode = g_ActiveConfig.iMultisampleMode;
D3D::Create(g_ActiveConfig.iAdapter, EmuWindow::GetWnd(), g_ActiveConfig.bFullscreen,
g_ActiveConfig.iFSResolution, g_ActiveConfig.iMultisampleMode);
g_ActiveConfig.iFSResolution, backbuffer_ms_mode);
s_targetWidth = D3D::GetDisplayWidth();
s_targetHeight = D3D::GetDisplayHeight();
@ -92,7 +93,6 @@ bool Renderer::Init()
D3D::dev->SetSamplerState(i, D3DSAMP_MAXANISOTROPY, 16);
D3D::BeginFrame(true, 0, 1.0f);
VertexManager::BeginFrame();
return true;
}
@ -308,7 +308,7 @@ void Renderer::SwapBuffers()
// So let's keep it commented out.
// D3D::EnableAlphaToCoverage();
VertexManager::BeginFrame();
UpdateViewport();
if (g_ActiveConfig.bOldCard)
D3D::font.SetRenderStates(); //compatibility with low end cards

4
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
View File

@ -101,10 +101,6 @@ void CreateDeviceObjects()
{
}
void BeginFrame()
{
}
void DestroyDeviceObjects()
{
}

2
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.h
View File

@ -27,8 +27,6 @@ namespace VertexManager
bool Init();
void Shutdown();
void BeginFrame();
void AddVertices(int _primitive, int _numVertices);
void Flush();

6
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -595,7 +595,6 @@ void GFXConfigDialogOGL::GeneralSettingsChanged(wxCommandEvent& event)
break;
case ID_WIDESCREEN_HACK:
g_Config.bWidescreenHack = m_WidescreenHack->IsChecked();
Projection_SetWidescreen(g_Config.bWidescreenHack);
break;
case ID_VSYNC:
g_Config.bVSync = m_VSync->IsChecked();
@ -713,7 +712,6 @@ void GFXConfigDialogOGL::AdvancedSettingsChanged(wxCommandEvent& event)
break;
case ID_FREELOOK:
g_Config.bFreeLook = m_FreeLook->IsChecked();
Projection_SetFreeLook(g_Config.bFreeLook);
break;
case ID_TEXTUREPATH:
break;
@ -731,11 +729,9 @@ void GFXConfigDialogOGL::AdvancedSettingsChanged(wxCommandEvent& event)
g_Config.bHack = m_Hack->IsChecked();
break;
case ID_RADIO_COPYEFBTORAM:
TextureMngr::ClearRenderTargets();
g_Config.bCopyEFBToRAM = true;
break;
case ID_RADIO_COPYEFBTOGL:
TextureMngr::ClearRenderTargets();
g_Config.bCopyEFBToRAM = false;
break;
case ID_PROJSTATS:
@ -784,7 +780,7 @@ void GFXConfigDialogOGL::UpdateGUI()
}
void Config::UpdateProjectionHack()
void VideoConfig::UpdateProjectionHack()
{
::UpdateProjectionHack(g_Config.iPhackvalue);
//switch(g_Config.iPhackvalue)

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

@ -979,7 +979,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
free(data);
s_criticalScreenshot.Leave();
} else {
if(s_bLastFrameDumped && f_pFrameDump != NULL) {
if (s_bLastFrameDumped && f_pFrameDump != NULL) {
fclose(f_pFrameDump);
f_pFrameDump = NULL;
}
@ -996,7 +996,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
GL_REPORT_ERRORD();
g_Config.iSaveTargetId = 0;
bool last_copy_efb_to_ram = g_ActiveConfig.bCopyEFBToRAM;
UpdateActiveConfig();
if (last_copy_efb_to_ram != g_ActiveConfig.bCopyEFBToRAM)
TextureMngr::ClearRenderTargets();
// For testing zbuffer targets.
// Renderer::SetZBufferRender();