diff options
author | Dudemanguy <random342@airmail.cc> | 2023-07-12 11:09:31 -0500 |
---|---|---|
committer | Dudemanguy <random342@airmail.cc> | 2023-07-13 12:12:37 +0000 |
commit | 4ff27d5220a999f38e3689cd6cc5a25a4c870b80 (patch) | |
tree | 245c98fbb6cdf338b2753a8446d295bc94e2c84e /video/out | |
parent | 33130741f45ac8d40a407da28788e77bc569f823 (diff) | |
download | mpv-4ff27d5220a999f38e3689cd6cc5a25a4c870b80.tar.bz2 mpv-4ff27d5220a999f38e3689cd6cc5a25a4c870b80.tar.xz |
Revert "wayland_gl: wait until resize to create egl_window"
The original reason for this commit was to prevent a compositor error on
weston when going into the maximized state. The configured dimensions of
mpv didn't match its actual size and Weston is super strict about this
so it threw a compositor error which is fatal. It only happened in
opengl and this seemed like an OK workaround, so I went with this.
However, there's actually a far easier way to solve this problem and we
don't need this anymore. This has the benefit of avoiding a harmless
warning message that appears with gpu-next on opengl. The next commit is
the proper solution. Closes #10324.
This reverts commit 661b5542de21d46d4d7c4693e564f4eec0526812.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/context_wayland.c | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c index 0380114e95..aa8bb2d921 100644 --- a/video/out/opengl/context_wayland.c +++ b/video/out/opengl/context_wayland.c @@ -37,34 +37,6 @@ struct priv { struct wl_egl_window *egl_window; }; -static void egl_create_window(struct ra_ctx *ctx) -{ - struct priv *p = ctx->priv; - struct vo_wayland_state *wl = ctx->vo->wl; - - p->egl_window = wl_egl_window_create(wl->surface, - mp_rect_w(wl->geometry), - mp_rect_h(wl->geometry)); - - p->egl_surface = mpegl_create_window_surface( - p->egl_display, p->egl_config, p->egl_window); - if (p->egl_surface == EGL_NO_SURFACE) { - p->egl_surface = eglCreateWindowSurface( - p->egl_display, p->egl_config, p->egl_window, NULL); - } - - eglMakeCurrent(p->egl_display, p->egl_surface, p->egl_surface, p->egl_context); - // eglMakeCurrent may not configure the draw or read buffers if the context - // has been made current previously. On nvidia GL_NONE is bound because EGL_NO_SURFACE - // is used initially and we must bind the read and draw buffers here. - if(!p->gl.es) { - p->gl.ReadBuffer(GL_BACK); - p->gl.DrawBuffer(GL_BACK); - } - - eglSwapInterval(p->egl_display, 0); -} - static void resize(struct ra_ctx *ctx) { struct priv *p = ctx->priv; @@ -72,9 +44,6 @@ static void resize(struct ra_ctx *ctx) MP_VERBOSE(wl, "Handling resize on the egl side\n"); - if (!p->egl_window) - egl_create_window(ctx); - const int32_t width = mp_rect_w(wl->geometry); const int32_t height = mp_rect_h(wl->geometry); @@ -149,9 +118,45 @@ static bool egl_create_context(struct ra_ctx *ctx) return true; } +static void egl_create_window(struct ra_ctx *ctx) +{ + struct priv *p = ctx->priv; + struct vo_wayland_state *wl = ctx->vo->wl; + + p->egl_window = wl_egl_window_create(wl->surface, + mp_rect_w(wl->geometry), + mp_rect_h(wl->geometry)); + + p->egl_surface = mpegl_create_window_surface( + p->egl_display, p->egl_config, p->egl_window); + if (p->egl_surface == EGL_NO_SURFACE) { + p->egl_surface = eglCreateWindowSurface( + p->egl_display, p->egl_config, p->egl_window, NULL); + } + + eglMakeCurrent(p->egl_display, p->egl_surface, p->egl_surface, p->egl_context); + // eglMakeCurrent may not configure the draw or read buffers if the context + // has been made current previously. On nvidia GL_NONE is bound because EGL_NO_SURFACE + // is used initially and we must bind the read and draw buffers here. + if(!p->gl.es) { + p->gl.ReadBuffer(GL_BACK); + p->gl.DrawBuffer(GL_BACK); + } + + eglSwapInterval(p->egl_display, 0); +} + static bool wayland_egl_reconfig(struct ra_ctx *ctx) { - return vo_wayland_reconfig(ctx->vo); + struct priv *p = ctx->priv; + + if (!vo_wayland_reconfig(ctx->vo)) + return false; + + if (!p->egl_window) + egl_create_window(ctx); + + return true; } static void wayland_egl_uninit(struct ra_ctx *ctx) |