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

win32-add some opengl initialization diagnostics clarification

This commit is contained in:
zeromus 2013-02-06 21:12:07 +00:00
parent 71345d4d20
commit db77b2456e
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/OGLRender.cpp
View File

@ -505,7 +505,7 @@ static char OGLInit(void)
if(!BEGINGL())
{
INFO("OpenGL: Could not initialize -- BEGINGL() failed.\n");
INFO("OpenGL<%s,%s>: Could not initialize -- BEGINGL() failed.\n",require_profile?"force":"auto",enable_3_2?"3_2":"old");
result = 0;
return result;
}
@ -690,7 +690,7 @@ GPU3DInterface gpu3Dgl = {
//forcibly use old profile
GPU3DInterface gpu3DglOld = {
"OpenGL",
"OpenGL Old",
OGLInit<true,false>,
OGLReset,
OGLClose,

14
desmume/src/windows/main.cpp
View File

@ -5958,19 +5958,27 @@ DOKEYDOWN:
void Change3DCoreWithFallbackAndSave(int newCore)
{
printf("Attempting change to 3d core to: %s\n",core3DList[newCore]->name);
if(newCore == GPU3D_OPENGL_OLD)
goto TRY_OGL;
goto TRY_OGL_OLD;
if(newCore == GPU3D_SWRAST)
goto TRY_SWRAST;
if(!NDS_3D_ChangeCore(GPU3D_OPENGL_3_2))
goto TRY_OGL;
{
printf("falling back to 3d core: %s\n",core3DList[GPU3D_OPENGL_OLD]->name);
goto TRY_OGL_OLD;
}
goto DONE;
TRY_OGL:
TRY_OGL_OLD:
if(!NDS_3D_ChangeCore(GPU3D_OPENGL_OLD))
{
printf("falling back to 3d core: %s\n",core3DList[GPU3D_SWRAST]->name);
goto TRY_SWRAST;
}
goto DONE;
TRY_SWRAST:

4
desmume/src/windows/ogl.cpp
View File

@ -118,9 +118,9 @@ bool windows_opengl_init()
int res = CheckHardwareSupport(main_hDC);
if (res>=0&&res<=2)
INFO("OpenGL mode: %s\n",opengl_modes[res]);
INFO("WGL OpenGL mode: %s\n",opengl_modes[res]);
else
INFO("OpenGL mode: uknown\n");
INFO("WGL OpenGL mode: uknown\n");
oglAlreadyInit = true;