Commit 0d6937b3 authored by Camilla Löwy's avatar Camilla Löwy
Browse files

Cleanup

parent af866e05
......@@ -233,15 +233,15 @@ static int choosePixelFormat(_GLFWwindow* window,
//
static GLFWbool isCompositionEnabled(void)
{
BOOL enabled;
if (!_glfw_DwmIsCompositionEnabled)
return FALSE;
if (_glfw.win32.dwmapi.instance)
{
BOOL enabled;
if (_glfw_DwmIsCompositionEnabled(&enabled) != S_OK)
return FALSE;
if (DwmIsCompositionEnabled(&enabled) == S_OK)
return enabled;
}
return enabled;
return FALSE;
}
static void makeContextCurrentWGL(_GLFWwindow* window)
......@@ -276,7 +276,7 @@ static void swapBuffersWGL(_GLFWwindow* window)
{
int count = abs(window->context.wgl.interval);
while (count--)
_glfw_DwmFlush();
DwmFlush();
}
SwapBuffers(window->context.wgl.dc);
......
......@@ -124,9 +124,9 @@ static GLFWbool loadLibraries(void)
_glfw.win32.dwmapi.instance = LoadLibraryA("dwmapi.dll");
if (_glfw.win32.dwmapi.instance)
{
_glfw.win32.dwmapi.DwmIsCompositionEnabled = (PFN_DwmIsCompositionEnabled)
_glfw.win32.dwmapi.IsCompositionEnabled = (PFN_DwmIsCompositionEnabled)
GetProcAddress(_glfw.win32.dwmapi.instance, "DwmIsCompositionEnabled");
_glfw.win32.dwmapi.DwmFlush = (PFN_DwmFlush)
_glfw.win32.dwmapi.Flush = (PFN_DwmFlush)
GetProcAddress(_glfw.win32.dwmapi.instance, "DwmFlush");
}
......
......@@ -180,8 +180,8 @@ typedef BOOL (WINAPI * PFN_ChangeWindowMessageFilterEx)(HWND,UINT,DWORD,PCHANGEF
// dwmapi.dll function pointer typedefs
typedef HRESULT (WINAPI * PFN_DwmIsCompositionEnabled)(BOOL*);
typedef HRESULT (WINAPI * PFN_DwmFlush)(VOID);
#define _glfw_DwmIsCompositionEnabled _glfw.win32.dwmapi.DwmIsCompositionEnabled
#define _glfw_DwmFlush _glfw.win32.dwmapi.DwmFlush
#define DwmIsCompositionEnabled _glfw.win32.dwmapi.IsCompositionEnabled
#define DwmFlush _glfw.win32.dwmapi.Flush
// shcore.dll function pointer typedefs
typedef HRESULT (WINAPI * PFN_SetProcessDpiAwareness)(PROCESS_DPI_AWARENESS);
......@@ -284,8 +284,8 @@ typedef struct _GLFWlibraryWin32
struct {
HINSTANCE instance;
PFN_DwmIsCompositionEnabled DwmIsCompositionEnabled;
PFN_DwmFlush DwmFlush;
PFN_DwmIsCompositionEnabled IsCompositionEnabled;
PFN_DwmFlush Flush;
} dwmapi;
struct {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment