Revert "(D3D) Updates"

This reverts commit 3f77a9b745f9f045a0d226c33ec6e1a7160ee3d1.
This commit is contained in:
twinaphex 2015-11-11 05:42:49 +01:00
parent 37154219f0
commit e90b8f1007

View File

@ -615,11 +615,8 @@ static bool d3d_construct(d3d_video_t *d3d,
#if defined(HAVE_WINDOW) && !defined(_XBOX) #if defined(HAVE_WINDOW) && !defined(_XBOX)
memset(&d3d->windowClass, 0, sizeof(d3d->windowClass)); memset(&d3d->windowClass, 0, sizeof(d3d->windowClass));
monitor_d3d_count = 0;
EnumDisplayMonitors(NULL, NULL, d3d_monitor_enum_proc, 0);
d3d->windowClass.cbSize = sizeof(d3d->windowClass); d3d->windowClass.cbSize = sizeof(d3d->windowClass);
d3d->windowClass.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; d3d->windowClass.style = CS_HREDRAW | CS_VREDRAW;
d3d->windowClass.lpfnWndProc = WindowProc; d3d->windowClass.lpfnWndProc = WindowProc;
d3d->windowClass.hInstance = NULL; d3d->windowClass.hInstance = NULL;
d3d->windowClass.hCursor = LoadCursor(NULL, IDC_ARROW); d3d->windowClass.hCursor = LoadCursor(NULL, IDC_ARROW);
@ -631,8 +628,7 @@ static bool d3d_construct(d3d_video_t *d3d,
if (!info->fullscreen) if (!info->fullscreen)
d3d->windowClass.hbrBackground = (HBRUSH)COLOR_WINDOW; d3d->windowClass.hbrBackground = (HBRUSH)COLOR_WINDOW;
if (!RegisterClassEx(&d3d->windowClass)) RegisterClassEx(&d3d->windowClass);
return false;
#endif #endif
#ifdef HAVE_MONITOR #ifdef HAVE_MONITOR
@ -925,6 +921,7 @@ static void d3d_monitor_rect(d3d_video_t *d3d, MONITORINFOEX *mon, HMONITOR *hm_
monitor_d3d_count = 0; monitor_d3d_count = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
EnumDisplayMonitors(NULL, NULL, d3d_monitor_enum_proc, 0);
if (!monitor_d3d_last) if (!monitor_d3d_last)
monitor_d3d_last = MonitorFromWindow( monitor_d3d_last = MonitorFromWindow(