diff options
Diffstat (limited to 'backend/headless/output.c')
| -rw-r--r-- | backend/headless/output.c | 106 |
1 files changed, 37 insertions, 69 deletions
diff --git a/backend/headless/output.c b/backend/headless/output.c index 315f5a33..d2160987 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -1,12 +1,12 @@ #include <assert.h> -#include <GLES2/gl2.h> -#include <GLES2/gl2ext.h> #include <stdlib.h> #include <stdio.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/wlr_renderer.h> #include <wlr/util/log.h> #include "backend/headless.h" +#include "render/swapchain.h" +#include "render/wlr_renderer.h" #include "util/signal.h" static struct wlr_headless_output *headless_output_from_output( @@ -15,53 +15,6 @@ static struct wlr_headless_output *headless_output_from_output( return (struct wlr_headless_output *)wlr_output; } -static bool create_fbo(struct wlr_headless_output *output, - unsigned int width, unsigned int height) { - if (!wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL)) { - return false; - } - - GLuint rbo; - glGenRenderbuffers(1, &rbo); - glBindRenderbuffer(GL_RENDERBUFFER, rbo); - glRenderbufferStorage(GL_RENDERBUFFER, output->backend->internal_format, - width, height); - glBindRenderbuffer(GL_RENDERBUFFER, 0); - - GLuint fbo; - glGenFramebuffers(1, &fbo); - glBindFramebuffer(GL_FRAMEBUFFER, fbo); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, - GL_RENDERBUFFER, rbo); - GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - - wlr_egl_unset_current(output->backend->egl); - - if (status != GL_FRAMEBUFFER_COMPLETE) { - wlr_log(WLR_ERROR, "Failed to create FBO"); - return false; - } - - output->fbo = fbo; - output->rbo = rbo; - return true; -} - -static void destroy_fbo(struct wlr_headless_output *output) { - if (!wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL)) { - return; - } - - glDeleteFramebuffers(1, &output->fbo); - glDeleteRenderbuffers(1, &output->rbo); - - wlr_egl_unset_current(output->backend->egl); - - output->fbo = 0; - output->rbo = 0; -} - static bool output_set_custom_mode(struct wlr_output *wlr_output, int32_t width, int32_t height, int32_t refresh) { struct wlr_headless_output *output = @@ -71,8 +24,10 @@ static bool output_set_custom_mode(struct wlr_output *wlr_output, int32_t width, refresh = HEADLESS_DEFAULT_REFRESH; } - destroy_fbo(output); - if (!create_fbo(output, width, height)) { + wlr_swapchain_destroy(output->swapchain); + output->swapchain = wlr_swapchain_create(output->backend->allocator, + width, height, output->backend->format); + if (!output->swapchain) { wlr_output_destroy(wlr_output); return false; } @@ -88,15 +43,20 @@ static bool output_attach_render(struct wlr_output *wlr_output, struct wlr_headless_output *output = headless_output_from_output(wlr_output); - if (!wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL)) { + wlr_buffer_unlock(output->back_buffer); + output->back_buffer = wlr_swapchain_acquire(output->swapchain, buffer_age); + if (!output->back_buffer) { return false; } - glBindFramebuffer(GL_FRAMEBUFFER, output->fbo); - - if (buffer_age != NULL) { - *buffer_age = 0; // We only have one buffer + if (!wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL)) { + return false; } + if (!wlr_renderer_bind_buffer(output->backend->renderer, + output->back_buffer)) { + return false; + } + return true; } @@ -131,10 +91,18 @@ static bool output_commit(struct wlr_output *wlr_output) { } if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { - glBindFramebuffer(GL_FRAMEBUFFER, 0); + assert(output->back_buffer != NULL); + + wlr_renderer_bind_buffer(output->backend->renderer, NULL); wlr_egl_unset_current(output->backend->egl); - // Nothing needs to be done for FBOs + wlr_buffer_unlock(output->front_buffer); + output->front_buffer = output->back_buffer; + output->back_buffer = NULL; + + wlr_swapchain_set_buffer_submitted(output->swapchain, + output->front_buffer); + wlr_output_send_present(wlr_output, NULL); } @@ -145,8 +113,12 @@ static void output_rollback_render(struct wlr_output *wlr_output) { struct wlr_headless_output *output = headless_output_from_output(wlr_output); assert(wlr_egl_is_current(output->backend->egl)); - glBindFramebuffer(GL_FRAMEBUFFER, 0); + + wlr_renderer_bind_buffer(output->backend->renderer, NULL); wlr_egl_unset_current(output->backend->egl); + + wlr_buffer_unlock(output->back_buffer); + output->back_buffer = NULL; } static void output_destroy(struct wlr_output *wlr_output) { @@ -154,7 +126,9 @@ static void output_destroy(struct wlr_output *wlr_output) { headless_output_from_output(wlr_output); wl_list_remove(&output->link); wl_event_source_remove(output->frame_timer); - destroy_fbo(output); + wlr_swapchain_destroy(output->swapchain); + wlr_buffer_unlock(output->back_buffer); + wlr_buffer_unlock(output->front_buffer); free(output); } @@ -192,7 +166,9 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, backend->display); struct wlr_output *wlr_output = &output->wlr_output; - if (!create_fbo(output, width, height)) { + output->swapchain = wlr_swapchain_create(backend->allocator, + width, height, backend->format); + if (!output->swapchain) { goto error; } @@ -207,14 +183,6 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, "Headless output %zd", backend->last_output_num); wlr_output_set_description(wlr_output, description); - if (!output_attach_render(wlr_output, NULL)) { - goto error; - } - - wlr_renderer_begin(backend->renderer, wlr_output->width, wlr_output->height); - wlr_renderer_clear(backend->renderer, (float[]){ 1.0, 1.0, 1.0, 1.0 }); - wlr_renderer_end(backend->renderer); - struct wl_event_loop *ev = wl_display_get_event_loop(backend->display); output->frame_timer = wl_event_loop_add_timer(ev, signal_frame, output); |