mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set g_quit outside of wgl_ctx.cpp

Browse Source
This commit is contained in:
twinaphex 2015-11-17 10:12:23 +01:00
parent 90b299c2f6
commit 9528738a09
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/common/win32_common.cpp
View File

@ -192,7 +192,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
case WM_CREATE:
if (!strcmp(video_driver, "gl"))
create_gl_context(hwnd);
{
if (create_gl_context(hwnd))
g_quit = true;
}
else if (!strcmp(video_driver, "d3d"))
{
LPCREATESTRUCT p_cs = (LPCREATESTRUCT)lparam;

2
gfx/common/win32_common.h
View File

@ -49,7 +49,7 @@ void win32_monitor_get_info(void);
void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id);
void create_gl_context(HWND hwnd);
bool create_gl_context(HWND hwnd);
#endif
void win32_monitor_init(void);

17
gfx/drivers_context/wgl_ctx.cpp
View File

@ -100,8 +100,9 @@ static void setup_pixel_format(HDC hdc)
SetPixelFormat(hdc, ChoosePixelFormat(hdc, &pfd), &pfd);
}
void create_gl_context(HWND hwnd)
bool create_gl_context(HWND hwnd)
{
bool quit;
bool core_context;
const struct retro_hw_render_callback *hw_render =
(const struct retro_hw_render_callback*)video_driver_callback();
@ -138,11 +139,11 @@ void create_gl_context(HWND hwnd)
if (!wglShareLists(g_hrc, g_hw_hrc))
{
RARCH_LOG("[WGL]: Failed to share contexts.\n");
g_quit = true;
quit = true;
}
}
else
g_quit = true;
quit = true;
}
}
@ -151,11 +152,11 @@ void create_gl_context(HWND hwnd)
if (wglMakeCurrent(g_hdc, g_hrc))
g_inited = true;
else
g_quit = true;
quit = true;
}
else
{
g_quit = true;
quit = true;
return;
}
@ -204,7 +205,7 @@ void create_gl_context(HWND hwnd)
wglDeleteContext(g_hrc);
g_hrc = context;
if (!wglMakeCurrent(g_hdc, g_hrc))
g_quit = true;
quit = true;
}
else
RARCH_ERR("[WGL]: Failed to create core context. Falling back to legacy context.\n");
@ -215,13 +216,15 @@ void create_gl_context(HWND hwnd)
if (!g_hw_hrc)
{
RARCH_ERR("[WGL]: Failed to create shared context.\n");
g_quit = true;
quit = true;
}
}
}
else
RARCH_ERR("[WGL]: wglCreateContextAttribsARB not supported.\n");
}
return quit;
}
void *dinput_wgl;