Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Win32 video mode enumeration faster

Browse Source
This commit is contained in:
Camilla Berglund 2015-09-20 16:25:00 +02:00
parent 3dc53e21e5
commit 842aeb8c47
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/win32_monitor.c
View File

@ -152,6 +152,9 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
DeleteDC(dc); DeleteDC(dc);
free(name); free(name);
if (adapter.StateFlags & DISPLAY_DEVICE_MODESPRUNED)
monitor->win32.modesPruned = GL_TRUE;
wcscpy(monitor->win32.adapterName, adapter.DeviceName); wcscpy(monitor->win32.adapterName, adapter.DeviceName);
wcscpy(monitor->win32.displayName, display.DeviceName); wcscpy(monitor->win32.displayName, display.DeviceName);
@ -226,15 +229,6 @@ GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)
modeIndex++; modeIndex++;
if (ChangeDisplaySettingsExW(monitor->win32.adapterName,
&dm,
NULL,
CDS_TEST,
NULL) != DISP_CHANGE_SUCCESSFUL)
{
continue;
}
// Skip modes with less than 15 BPP // Skip modes with less than 15 BPP
if (dm.dmBitsPerPel < 15) if (dm.dmBitsPerPel < 15)
continue; continue;
@ -257,6 +251,19 @@ GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)
if (i < *count) if (i < *count)
continue; continue;
if (monitor->win32.modesPruned)
{
// Skip modes not supported by the connected displays
if (ChangeDisplaySettingsExW(monitor->win32.adapterName,
&dm,
NULL,
CDS_TEST,
NULL) != DISP_CHANGE_SUCCESSFUL)
{
continue;
}
}
if (*count == size) if (*count == size)
{ {
if (*count) if (*count)

1
src/win32_platform.h
View File

@ -203,6 +203,7 @@ typedef struct _GLFWmonitorWin32
WCHAR displayName[32]; WCHAR displayName[32];
char publicAdapterName[64]; char publicAdapterName[64];
char publicDisplayName[64]; char publicDisplayName[64];
GLboolean modesPruned;
GLboolean modeChanged; GLboolean modeChanged;
} _GLFWmonitorWin32; } _GLFWmonitorWin32;