aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/headless/backend.c27
-rw-r--r--backend/headless/output.c85
-rw-r--r--include/backend/headless.h5
3 files changed, 85 insertions, 32 deletions
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 19c62078..73ec9ebd 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -1,9 +1,10 @@
#include <assert.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
#include <stdlib.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/render/egl.h>
-#include <wlr/render/gles2.h>
#include <wlr/util/log.h>
#include "backend/headless.h"
#include "util/signal.h"
@@ -100,9 +101,8 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display,
wl_list_init(&backend->input_devices);
static const EGLint config_attribs[] = {
- EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+ EGL_SURFACE_TYPE, 0,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
- EGL_ALPHA_SIZE, 0,
EGL_BLUE_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_RED_SIZE, 1,
@@ -118,14 +118,31 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display,
(EGLint*)config_attribs, 0);
if (!backend->renderer) {
wlr_log(WLR_ERROR, "Failed to create renderer");
- free(backend);
- return NULL;
+ goto error_backend;
+ }
+
+ if (wlr_gles2_renderer_check_ext(backend->renderer, "GL_OES_rgb8_rgba8") ||
+ wlr_gles2_renderer_check_ext(backend->renderer,
+ "GL_OES_required_internalformat") ||
+ wlr_gles2_renderer_check_ext(backend->renderer, "GL_ARM_rgba8")) {
+ backend->internal_format = GL_RGBA8_OES;
+ } else {
+ wlr_log(WLR_INFO, "GL_RGBA8_OES not supported, "
+ "falling back to GL_RGBA4 internal format "
+ "(performance may be affected)");
+ backend->internal_format = GL_RGBA4;
}
backend->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &backend->display_destroy);
return &backend->backend;
+
+error_renderer:
+ wlr_renderer_destroy(backend->renderer);
+error_backend:
+ free(backend);
+ return NULL;
}
bool wlr_backend_is_headless(struct wlr_backend *backend) {
diff --git a/backend/headless/output.c b/backend/headless/output.c
index 918581f5..0f6a1549 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -1,4 +1,6 @@
#include <assert.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
#include <stdlib.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/render/wlr_renderer.h>
@@ -12,33 +14,59 @@ static struct wlr_headless_output *headless_output_from_output(
return (struct wlr_headless_output *)wlr_output;
}
-static EGLSurface egl_create_surface(struct wlr_egl *egl, unsigned int width,
- unsigned int height) {
- EGLint attribs[] = {EGL_WIDTH, width, EGL_HEIGHT, height, EGL_NONE};
+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;
+ }
- EGLSurface surf = eglCreatePbufferSurface(egl->display, egl->config, attribs);
- if (surf == EGL_NO_SURFACE) {
- wlr_log(WLR_ERROR, "Failed to create EGL surface");
- return EGL_NO_SURFACE;
+ 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);
+
+ if (status != GL_FRAMEBUFFER_COMPLETE) {
+ wlr_log(WLR_ERROR, "Failed to create FBO");
+ return false;
}
- return surf;
+
+ 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);
+ 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 =
headless_output_from_output(wlr_output);
- struct wlr_headless_backend *backend = output->backend;
if (refresh <= 0) {
refresh = HEADLESS_DEFAULT_REFRESH;
}
- wlr_egl_destroy_surface(&backend->egl, output->egl_surface);
-
- output->egl_surface = egl_create_surface(&backend->egl, width, height);
- if (output->egl_surface == EGL_NO_SURFACE) {
- wlr_log(WLR_ERROR, "Failed to recreate EGL surface");
+ destroy_fbo(output);
+ if (!create_fbo(output, width, height)) {
wlr_output_destroy(wlr_output);
return false;
}
@@ -53,8 +81,17 @@ static bool output_attach_render(struct wlr_output *wlr_output,
int *buffer_age) {
struct wlr_headless_output *output =
headless_output_from_output(wlr_output);
- return wlr_egl_make_current(&output->backend->egl, output->egl_surface,
- buffer_age);
+
+ if (!wlr_egl_make_current(&output->backend->egl, EGL_NO_SURFACE, NULL)) {
+ return false;
+ }
+
+ glBindFramebuffer(GL_FRAMEBUFFER, output->fbo);
+
+ if (buffer_age != NULL) {
+ *buffer_age = 0; // We only have one buffer
+ }
+ return true;
}
static bool output_test(struct wlr_output *wlr_output) {
@@ -88,11 +125,12 @@ static bool output_commit(struct wlr_output *wlr_output) {
}
if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
- // Nothing needs to be done for pbuffers
+ // Nothing needs to be done for FBOs
wlr_output_send_present(wlr_output, NULL);
}
wlr_egl_make_current(&output->backend->egl, EGL_NO_SURFACE, NULL);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
return true;
}
@@ -101,17 +139,15 @@ static void output_rollback(struct wlr_output *wlr_output) {
struct wlr_headless_output *output =
headless_output_from_output(wlr_output);
wlr_egl_make_current(&output->backend->egl, EGL_NO_SURFACE, NULL);
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
static void output_destroy(struct wlr_output *wlr_output) {
struct wlr_headless_output *output =
headless_output_from_output(wlr_output);
-
wl_list_remove(&output->link);
-
wl_event_source_remove(output->frame_timer);
-
- wlr_egl_destroy_surface(&output->backend->egl, output->egl_surface);
+ destroy_fbo(output);
free(output);
}
@@ -149,9 +185,7 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend,
backend->display);
struct wlr_output *wlr_output = &output->wlr_output;
- output->egl_surface = egl_create_surface(&backend->egl, width, height);
- if (output->egl_surface == EGL_NO_SURFACE) {
- wlr_log(WLR_ERROR, "Failed to create EGL surface");
+ if (!create_fbo(output, width, height)) {
goto error;
}
@@ -166,8 +200,7 @@ 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 (!wlr_egl_make_current(&output->backend->egl, output->egl_surface,
- NULL)) {
+ if (!output_attach_render(wlr_output, NULL)) {
goto error;
}
diff --git a/include/backend/headless.h b/include/backend/headless.h
index 66448071..d8cb4dc2 100644
--- a/include/backend/headless.h
+++ b/include/backend/headless.h
@@ -3,6 +3,7 @@
#include <wlr/backend/headless.h>
#include <wlr/backend/interface.h>
+#include <wlr/render/gles2.h>
#define HEADLESS_DEFAULT_REFRESH (60 * 1000) // 60 Hz
@@ -16,6 +17,7 @@ struct wlr_headless_backend {
struct wl_list input_devices;
struct wl_listener display_destroy;
bool started;
+ GLenum internal_format;
};
struct wlr_headless_output {
@@ -24,7 +26,8 @@ struct wlr_headless_output {
struct wlr_headless_backend *backend;
struct wl_list link;
- void *egl_surface;
+ GLuint fbo, rbo;
+
struct wl_event_source *frame_timer;
int frame_delay; // ms
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 06:10:00 +0000