mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 21:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-11-17 10:49:36 +01:00
parent daaabaa663
commit 3ff5c91e5c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/common/win32_common.cpp
View File

@ -101,9 +101,11 @@ static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
void win32_monitor_from_window(HWND data, bool destroy) void win32_monitor_from_window(HWND data, bool destroy)
{ {
#ifndef _XBOX
win32_monitor_last = MonitorFromWindow(data, MONITOR_DEFAULTTONEAREST); win32_monitor_last = MonitorFromWindow(data, MONITOR_DEFAULTTONEAREST);
if (destroy) if (destroy)
DestroyWindow(data); DestroyWindow(data);
#endif
} }
void win32_monitor_get_info(void) void win32_monitor_get_info(void)
@ -679,6 +681,11 @@ static HANDLE GetFocus(void)
{ {
return g_hwnd; return g_hwnd;
} }
BOOL IsIconic(HWND hwnd)
{
return FALSE;
}
#endif #endif
bool win32_has_focus(void) bool win32_has_focus(void)

9
gfx/common/win32_common.h
View File

@ -41,9 +41,6 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
LRESULT win32_menu_loop(HWND handle, WPARAM wparam); LRESULT win32_menu_loop(HWND handle, WPARAM wparam);
void win32_monitor_from_window(HWND data, bool destroy);
void win32_monitor_get_info(void); void win32_monitor_get_info(void);
void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id); void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id);
@ -51,6 +48,8 @@ void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id);
bool create_gl_context(HWND hwnd); bool create_gl_context(HWND hwnd);
#endif #endif
void win32_monitor_from_window(HWND data, bool destroy);
void win32_monitor_init(void); void win32_monitor_init(void);
bool win32_set_video_mode(void *data, bool win32_set_video_mode(void *data,
@ -84,4 +83,8 @@ void win32_window_reset(void);
void win32_destroy_window(void); void win32_destroy_window(void);
#ifdef _XBOX
BOOL IsIconic(HWND hwnd);
#endif
#endif #endif

4
gfx/d3d/d3d.cpp
View File

@ -846,9 +846,7 @@ static void d3d_free(void *data)
if (d3d->g_pD3D) if (d3d->g_pD3D)
d3d->g_pD3D->Release(); d3d->g_pD3D->Release();
#ifdef HAVE_MONITOR
win32_monitor_from_window(window, true); win32_monitor_from_window(window, true);
#endif
if (d3d) if (d3d)
delete d3d; delete d3d;
@ -1482,11 +1480,9 @@ static bool d3d_frame(void *data, const void *frame,
rarch_perf_init(&d3d_frame, "d3d_frame"); rarch_perf_init(&d3d_frame, "d3d_frame");
retro_perf_start(&d3d_frame); retro_perf_start(&d3d_frame);
#ifndef _XBOX
/* We cannot recover in fullscreen. */ /* We cannot recover in fullscreen. */
if (d3d->needs_restore && IsIconic(window)) if (d3d->needs_restore && IsIconic(window))
return true; return true;
#endif
if (d3d->needs_restore && !d3d_restore(d3d)) if (d3d->needs_restore && !d3d_restore(d3d))
{ {
RARCH_ERR("[D3D]: Failed to restore.\n"); RARCH_ERR("[D3D]: Failed to restore.\n");