blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

render/gles2: make wlr_gles2_buffer an addon 

Saves us from walking a list.
This commit is contained in:
Simon Ser 2021-08-11 10:00:50 +02:00
parent 93964012e6
commit ee1156b62b
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/render/gles2.h
View File

@ -12,6 +12,7 @@
#include <wlr/render/interface.h> #include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/render/wlr_texture.h> #include <wlr/render/wlr_texture.h>
#include <wlr/util/addon.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
struct wlr_gles2_pixel_format { struct wlr_gles2_pixel_format {
@ -84,7 +85,7 @@ struct wlr_gles2_buffer {
GLuint rbo; GLuint rbo;
GLuint fbo; GLuint fbo;
struct wl_listener buffer_destroy; struct wlr_addon addon;
}; };
struct wlr_gles2_texture { struct wlr_gles2_texture {

37
render/gles2/renderer.c
View File

@ -48,7 +48,7 @@ static struct wlr_gles2_renderer *gles2_get_renderer_in_context(
static void destroy_buffer(struct wlr_gles2_buffer *buffer) { static void destroy_buffer(struct wlr_gles2_buffer *buffer) {
wl_list_remove(&buffer->link); wl_list_remove(&buffer->link);
wl_list_remove(&buffer->buffer_destroy.link); wlr_addon_finish(&buffer->addon);
struct wlr_egl_context prev_ctx; struct wlr_egl_context prev_ctx;
wlr_egl_save_context(&prev_ctx); wlr_egl_save_context(&prev_ctx);
@ -68,21 +68,26 @@ static void destroy_buffer(struct wlr_gles2_buffer *buffer) {
free(buffer); free(buffer);
} }
static struct wlr_gles2_buffer *get_buffer(struct wlr_gles2_renderer *renderer, static void handle_buffer_destroy(struct wlr_addon *addon) {
struct wlr_buffer *wlr_buffer) { struct wlr_gles2_buffer *buffer =
struct wlr_gles2_buffer *buffer; wl_container_of(addon, buffer, addon);
wl_list_for_each(buffer, &renderer->buffers, link) { destroy_buffer(buffer);
if (buffer->buffer == wlr_buffer) {
return buffer;
}
}
return NULL;
} }
static void handle_buffer_destroy(struct wl_listener *listener, void *data) { static const struct wlr_addon_interface buffer_addon_impl = {
struct wlr_gles2_buffer *buffer = .name = "wlr_gles2_buffer",
wl_container_of(listener, buffer, buffer_destroy); .destroy = handle_buffer_destroy,
destroy_buffer(buffer); };
static struct wlr_gles2_buffer *get_buffer(struct wlr_gles2_renderer *renderer,
struct wlr_buffer *wlr_buffer) {
struct wlr_addon *addon =
wlr_addon_find(&wlr_buffer->addons, renderer, &buffer_addon_impl);
if (addon == NULL) {
return NULL;
}
struct wlr_gles2_buffer *buffer = wl_container_of(addon, buffer, addon);
return buffer;
} }
static struct wlr_gles2_buffer *create_buffer(struct wlr_gles2_renderer *renderer, static struct wlr_gles2_buffer *create_buffer(struct wlr_gles2_renderer *renderer,
@ -129,8 +134,8 @@ static struct wlr_gles2_buffer *create_buffer(struct wlr_gles2_renderer *rendere
goto error_image; goto error_image;
} }
buffer->buffer_destroy.notify = handle_buffer_destroy; wlr_addon_init(&buffer->addon, &wlr_buffer->addons, renderer,
wl_signal_add(&wlr_buffer->events.destroy, &buffer->buffer_destroy); &buffer_addon_impl);
wl_list_insert(&renderer->buffers, &buffer->link); wl_list_insert(&renderer->buffers, &buffer->link);