OSMesa: Context creation compliance fixes

This commit is contained in:
Camilla Berglund
2016-11-08 23:43:45 +01:00
parent 62012e3c68
commit 0e8d129efb
2 changed files with 26 additions and 5 deletions
+12 -5
View File
@@ -47,18 +47,25 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig)
{
if (!_glfwInitOSMesa())
if (!createNativeWindow(window, wndconfig))
return GLFW_FALSE;
if (ctxconfig->client != GLFW_NO_API)
{
if (!_glfwCreateContextOSMesa(window, ctxconfig, fbconfig))
if (ctxconfig->source == GLFW_NATIVE_CONTEXT_API)
{
if (!_glfwInitOSMesa())
return GLFW_FALSE;
if (!_glfwCreateContextOSMesa(window, ctxconfig, fbconfig))
return GLFW_FALSE;
}
else
{
_glfwInputError(GLFW_API_UNAVAILABLE, "OSMesa: EGL not available");
return GLFW_FALSE;
}
}
if (!createNativeWindow(window, wndconfig))
return GLFW_FALSE;
return GLFW_TRUE;
}