Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes for transparent WGL/DWM from transparent-windows

Browse Source
This commit is contained in:
Bailey Cosier 2017-09-17 00:03:35 +07:00
parent 6d4708f78a
commit 40de269e91
2 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/internal.h
View File

@ -409,7 +409,6 @@ struct _GLFWwindow
GLFWbool autoIconify; GLFWbool autoIconify;
GLFWbool floating; GLFWbool floating;
GLFWbool shouldClose; GLFWbool shouldClose;
GLFWbool transparent;
void* userPointer; void* userPointer;
GLFWvidmode videoMode; GLFWvidmode videoMode;
_GLFWmonitor* monitor; _GLFWmonitor* monitor;

57
src/wgl_context.c
View File

@ -224,7 +224,7 @@ static int choosePixelFormat(_GLFWwindow* window,
free(usableConfigs); free(usableConfigs);
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"WGL: No pixel format found for transparent window. Ignoring transparency."); "WGL: No pixel format found for transparent window. Ignoring transparency.");
return choosePixelFormat(window, desired, result); return choosePixelFormat(window, ctxconfig, fbconfig);
} }
if (!usableCount) if (!usableCount)
@ -535,7 +535,7 @@ static GLFWbool isWindows8OrGreater()
static GLFWbool setupTransparentWindow(_GLFWwindow* window) static GLFWbool setupTransparentWindow(_GLFWwindow* window)
{ {
if (!isCompositionEnabled) { if (!DwmIsCompositionEnabled) {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"WGL: Composition needed for transparent window is disabled"); "WGL: Composition needed for transparent window is disabled");
} }
@ -783,53 +783,8 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
ctxconfig->minor); ctxconfig->minor);
} }
} }
else if (error == (0xc0070000 | ERROR_INVALID_PROFILE_ARB)) { else if (error == (0xc0070000 | ERROR_INVALID_PROFILE_ARB))
// TODO: _glfwInputError
}
}
}
if (window->transparent)
{
if (!setupTransparentWindow(window))
window->transparent = GLFW_FALSE;
}
return GLFW_TRUE;
}
#undef setWGLattrib
// Destroy the OpenGL context
//
void _glfwDestroyContextWGL(_GLFWwindow* window)
{
if (window->context.wgl.handle)
{
wglDeleteContext(window->context.wgl.handle);
window->context.wgl.handle = NULL;
}
}
// Analyzes the specified context for possible recreation
//
int _glfwAnalyzeContextWGL(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig)
{
GLFWbool required = GLFW_FALSE;
if (_glfw.wgl.extensionsLoaded)
return _GLFW_RECREATION_NOT_NEEDED;
_glfwPlatformMakeContextCurrent(window);
loadExtensions();
if (ctxconfig->api == GLFW_OPENGL_API)
{
if (ctxconfig->forward)
{
if (!_glfw.wgl.ARB_create_context)
{ {
_glfwInputError(GLFW_VERSION_UNAVAILABLE, _glfwInputError(GLFW_VERSION_UNAVAILABLE,
"WGL: Driver does not support the requested OpenGL profile"); "WGL: Driver does not support the requested OpenGL profile");
@ -877,6 +832,12 @@ int _glfwAnalyzeContextWGL(_GLFWwindow* window,
} }
} }
if (window->transparent)
{
if (!setupTransparentWindow(window))
window->transparent = GLFW_FALSE;
}
window->context.makeCurrent = makeContextCurrentWGL; window->context.makeCurrent = makeContextCurrentWGL;
window->context.swapBuffers = swapBuffersWGL; window->context.swapBuffers = swapBuffersWGL;
window->context.swapInterval = swapIntervalWGL; window->context.swapInterval = swapIntervalWGL;