mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move DWM enabled test to file where it is used

Browse Source
This commit is contained in:
Camilla Berglund 2015-12-06 16:19:39 +01:00
parent 72632a846b
commit 75f1dfaf8a
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wgl_context.c
View File

@ -265,6 +265,21 @@ static GLFWbool choosePixelFormat(_GLFWwindow* window,
return GLFW_TRUE; return GLFW_TRUE;
} }
// Returns whether desktop compositing is enabled
//
static GLFWbool isCompositionEnabled(void)
{
BOOL enabled;
if (!_glfw_DwmIsCompositionEnabled)
return FALSE;
if (_glfw_DwmIsCompositionEnabled(&enabled) != S_OK)
return FALSE;
return enabled;
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW internal API ////// ////// GLFW internal API //////
@ -595,7 +610,7 @@ void _glfwPlatformMakeContextCurrent(_GLFWwindow* window)
void _glfwPlatformSwapBuffers(_GLFWwindow* window) void _glfwPlatformSwapBuffers(_GLFWwindow* window)
{ {
// HACK: Use DwmFlush when desktop composition is enabled // HACK: Use DwmFlush when desktop composition is enabled
if (_glfwIsCompositionEnabled() && !window->monitor) if (isCompositionEnabled() && !window->monitor)
{ {
int count = abs(window->context.wgl.interval); int count = abs(window->context.wgl.interval);
while (count--) while (count--)

15
src/win32_init.c
View File

@ -290,21 +290,6 @@ static HWND createHelperWindow(void)
////// GLFW internal API ////// ////// GLFW internal API //////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Returns whether desktop compositing is enabled
//
BOOL _glfwIsCompositionEnabled(void)
{
BOOL enabled;
if (!_glfw_DwmIsCompositionEnabled)
return FALSE;
if (_glfw_DwmIsCompositionEnabled(&enabled) != S_OK)
return FALSE;
return enabled;
}
// Returns a wide string version of the specified UTF-8 string // Returns a wide string version of the specified UTF-8 string
// //
WCHAR* _glfwCreateWideStringFromUTF8(const char* source) WCHAR* _glfwCreateWideStringFromUTF8(const char* source)

2
src/win32_platform.h
View File

@ -262,8 +262,6 @@ typedef struct _GLFWtimeWin32
GLFWbool _glfwRegisterWindowClass(void); GLFWbool _glfwRegisterWindowClass(void);
void _glfwUnregisterWindowClass(void); void _glfwUnregisterWindowClass(void);
BOOL _glfwIsCompositionEnabled(void);
WCHAR* _glfwCreateWideStringFromUTF8(const char* source); WCHAR* _glfwCreateWideStringFromUTF8(const char* source);
char* _glfwCreateUTF8FromWideString(const WCHAR* source); char* _glfwCreateUTF8FromWideString(const WCHAR* source);