Merged in a few changes from master.

This is not a complete merge; I don't have time right now to do so.
This commit is contained in:
Cem Karan 2016-08-29 11:33:43 -04:00
parent b1f6c9046a
commit 1557990fa1
2 changed files with 0 additions and 11 deletions

View File

@ -181,12 +181,6 @@ const _GLFWfbconfig* _glfwChooseFBConfig(const _GLFWfbconfig* desired,
continue;
}
if (desired->transparent > 0 && current->transparent == 0)
{
// Alpha mask is a hard constraint
continue;
}
// Count number of missing buffers
{
missing = 0;

View File

@ -178,7 +178,6 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
window->decorated = wndconfig.decorated;
window->autoIconify = wndconfig.autoIconify;
window->floating = wndconfig.floating;
window->transparent = wndconfig.transparent;
window->cursorMode = GLFW_CURSOR_NORMAL;
window->minwidth = GLFW_DONT_CARE;
@ -258,7 +257,6 @@ void glfwDefaultWindowHints(void)
_glfw.hints.framebuffer.depthBits = 24;
_glfw.hints.framebuffer.stencilBits = 8;
_glfw.hints.framebuffer.doublebuffer = GLFW_TRUE;
_glfw.hints.framebuffer.transparent = GLFW_FALSE;
// The default is to select the highest available refresh rate
_glfw.hints.refreshRate = GLFW_DONT_CARE;
@ -309,9 +307,6 @@ GLFWAPI void glfwWindowHint(int hint, int value)
case GLFW_DOUBLEBUFFER:
_glfw.hints.framebuffer.doublebuffer = value ? GLFW_TRUE : GLFW_FALSE;
break;
case GLFW_TRANSPARENT:
_glfw.hints.framebuffer.transparent = hint ? GLFW_TRUE : GLFW_FALSE;
break;
case GLFW_SAMPLES:
_glfw.hints.framebuffer.samples = value;
break;