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

Add transparent flag piping to choosePixelFormat() due to fbconfig being const.

Browse Source 
In the event transparency cannot be achieved, choosePixelFormat() recurses itself
with this flag set to GLFW_FALSE.
This commit is contained in:
Bailey Cosier 2017-09-17 21:56:39 +07:00
parent b8157fea5d
commit 96d49ba28d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wgl_context.c
View File

@ -56,7 +56,8 @@ static int getPixelFormatAttrib(_GLFWwindow* window, int pixelFormat, int attrib
// //
static int choosePixelFormat(_GLFWwindow* window, static int choosePixelFormat(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig, const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig,
const int transparent)
{ {
_GLFWfbconfig* usableConfigs; _GLFWfbconfig* usableConfigs;
const _GLFWfbconfig* closest; const _GLFWfbconfig* closest;
@ -215,18 +216,17 @@ static int choosePixelFormat(_GLFWwindow* window,
u->handle = n; u->handle = n;
// always able to go transparent on win dwmapi // always able to go transparent on win dwmapi
u->transparent = 1; u->transparent = GLFW_TRUE;
usableCount++; usableCount++;
} }
// Reiterate the selection loop without looking for transparency supporting // Reiterate the selection loop without looking for transparency supporting
// formats if no matching pixelformat for a transparent window were found. // formats if no matching pixelformat for a transparent window were found.
if (fbconfig->transparent && !usableCount) { if (fbconfig->transparent && !usableCount) {
fbconfig->transparent = GLFW_FALSE;
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, ctxconfig, fbconfig); return choosePixelFormat(window, ctxconfig, fbconfig, GLFW_FALSE);
} }
if (!usableCount) if (!usableCount)
@ -629,7 +629,7 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
return GLFW_FALSE; return GLFW_FALSE;
} }
pixelFormat = choosePixelFormat(window, ctxconfig, fbconfig); pixelFormat = choosePixelFormat(window, ctxconfig, fbconfig, fbconfig->transparent);
if (!pixelFormat) if (!pixelFormat)
return GLFW_FALSE; return GLFW_FALSE;
@ -837,7 +837,8 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window,
if (fbconfig->transparent) if (fbconfig->transparent)
{ {
if (!setupTransparentWindow(window)) if (!setupTransparentWindow(window))
fbconfig->transparent = GLFW_FALSE; _glfwInputErrorWin32(GLFW_PLATFORM_ERROR,
"WGL: Failed to setup window as transparent as requested");
} }
window->context.makeCurrent = makeContextCurrentWGL; window->context.makeCurrent = makeContextCurrentWGL;