gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Mir: Fix window/context creation order

Browse Source 
Need to create the native window before creating the context as creating
the context creates the EGL surface.
This commit is contained in:
bschaefer 2016-04-16 16:27:42 -07:00 committed by Camilla Berglund
parent 1e82832737
commit f000b5daff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mir_window.c
View File

@ -345,12 +345,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig, const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
if (ctxconfig->api != GLFW_NO_API)
{
if (!_glfwCreateContextEGL(window, ctxconfig, fbconfig))
return GLFW_FALSE;
}
if (window->monitor) if (window->monitor)
{ {
GLFWvidmode mode; GLFWvidmode mode;
@ -377,6 +371,12 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
window->mir.window = mir_buffer_stream_get_egl_native_window( window->mir.window = mir_buffer_stream_get_egl_native_window(
mir_surface_get_buffer_stream(window->mir.surface)); mir_surface_get_buffer_stream(window->mir.surface));
if (ctxconfig->api != GLFW_NO_API)
{
if (!_glfwCreateContextEGL(window, ctxconfig, fbconfig))
return GLFW_FALSE;
}
return GLFW_TRUE; return GLFW_TRUE;
} }