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

FIX issues with NO_D3D 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@321 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2008-01-19 02:06:42 +00:00
parent c73edf150f
commit 54f4154953
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/win32/FullscreenSettings.cpp
View File

@ -278,6 +278,7 @@ void FullscreenSettings::OnOK()
{ {
if( failed ) return; if( failed ) return;
#ifndef NO_D3D
int selection; int selection;
selection = combo_device.GetCurSel(); selection = combo_device.GetCurSel();
@ -314,7 +315,7 @@ void FullscreenSettings::OnOK()
m_width = (unsigned int)mode.Width; m_width = (unsigned int)mode.Width;
m_height = (unsigned int)mode.Height; m_height = (unsigned int)mode.Height;
m_refreshRate = (unsigned int)mode.RefreshRate; m_refreshRate = (unsigned int)mode.RefreshRate;
#endif
CDialog::OnOK(); CDialog::OnOK();
} }

14
src/win32/VBA.cpp
View File

@ -1407,14 +1407,16 @@ void VBA::loadSettings()
} }
renderMethod = (DISPLAY_TYPE)regQueryDwordValue("renderMethod", DIRECT_3D); renderMethod = (DISPLAY_TYPE)regQueryDwordValue("renderMethod", DIRECT_3D);
if( ( renderMethod != DIRECT_3D ) && ( renderMethod != OPENGL ) ) { #ifdef NO_OGL
#ifndef NO_OGL if( renderMethod == OPENGL ) {
renderMethod = OPENGL;
#endif
#ifndef NO_D3D
renderMethod = DIRECT_3D; renderMethod = DIRECT_3D;
#endif
} }
#endif
#ifdef NO_D3D
if( renderMethod == DIRECT_3D ) {
renderMethod = OPENGL;
}
#endif
audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND ); audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
if( ( audioAPI != DIRECTSOUND ) if( ( audioAPI != DIRECTSOUND )