Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-12-01 14:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Only create EGL window if using EGL

Browse Source 
(cherry picked from commit d578c2ddfe)
This commit is contained in:
Camilla Löwy 2022-06-21 19:52:39 +02:00
parent be333cf0fd
commit e541b7969a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wl_window.c
View File

@ -351,7 +351,9 @@ static void resizeWindow(_GLFWwindow* window)
int scale = window->wl.scale; int scale = window->wl.scale;
int scaledWidth = window->wl.width * scale; int scaledWidth = window->wl.width * scale;
int scaledHeight = window->wl.height * scale; int scaledHeight = window->wl.height * scale;
wl_egl_window_resize(window->wl.egl.window, scaledWidth, scaledHeight, 0, 0);
if (window->wl.egl.window)
wl_egl_window_resize(window->wl.egl.window, scaledWidth, scaledHeight, 0, 0);
if (!window->wl.transparent) if (!window->wl.transparent)
setContentAreaOpaque(window); setContentAreaOpaque(window);
_glfwInputFramebufferSize(window, scaledWidth, scaledHeight); _glfwInputFramebufferSize(window, scaledWidth, scaledHeight);
@ -772,15 +774,6 @@ static GLFWbool createNativeSurface(_GLFWwindow* window,
wl_surface_set_user_data(window->wl.surface, window); wl_surface_set_user_data(window->wl.surface, window);
window->wl.egl.window = wl_egl_window_create(window->wl.surface,
wndconfig->width,
wndconfig->height);
if (!window->wl.egl.window)
{
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: Failed to create EGL window");
return GLFW_FALSE;
}
window->wl.width = wndconfig->width; window->wl.width = wndconfig->width;
window->wl.height = wndconfig->height; window->wl.height = wndconfig->height;
window->wl.scale = 1; window->wl.scale = 1;
@ -1880,6 +1873,16 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if (ctxconfig->source == GLFW_EGL_CONTEXT_API || if (ctxconfig->source == GLFW_EGL_CONTEXT_API ||
ctxconfig->source == GLFW_NATIVE_CONTEXT_API) ctxconfig->source == GLFW_NATIVE_CONTEXT_API)
{ {
window->wl.egl.window = wl_egl_window_create(window->wl.surface,
wndconfig->width,
wndconfig->height);
if (!window->wl.egl.window)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Failed to create EGL window");
return GLFW_FALSE;
}
if (!_glfwInitEGL()) if (!_glfwInitEGL())
return GLFW_FALSE; return GLFW_FALSE;
if (!_glfwCreateContextEGL(window, ctxconfig, fbconfig)) if (!_glfwCreateContextEGL(window, ctxconfig, fbconfig))