From db6325853ad8c57143f00452157c18ddd96a65a6 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Wed, 13 Mar 2013 19:47:11 +0100 Subject: wayland: simplify egl_create_window Removes the local ret because it was only in an assert statement and also removes the window size assignments, because they are already done in config_wnidow_wayland. --- video/out/gl_common.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 1eda2eaf30..c2e3fed7e6 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -1447,13 +1447,6 @@ static void egl_create_window(struct vo_wayland_state *wl, uint32_t width, uint32_t height) { - EGLBoolean ret; - - wl->window->pending_width = width; - wl->window->pending_height = height; - wl->window->width = width; - wl->window->height = height; - egl_ctx->egl_window = wl_egl_window_create(wl->window->surface, wl->window->width, wl->window->height); @@ -1463,12 +1456,10 @@ static void egl_create_window(struct vo_wayland_state *wl, egl_ctx->egl_window, NULL); - ret = eglMakeCurrent(egl_ctx->egl.dpy, - egl_ctx->egl_surface, - egl_ctx->egl_surface, - egl_ctx->egl.ctx); - - assert(ret == EGL_TRUE); + eglMakeCurrent(egl_ctx->egl.dpy, + egl_ctx->egl_surface, + egl_ctx->egl_surface, + egl_ctx->egl.ctx); wl_display_dispatch_pending(wl->display->display); } -- cgit v1.2.3