hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

renderer/gles2: Merge get_buffer and create_buffer

Browse source
This commit is contained in:
Alexander Orzechowski 2023-05-22 16:20:26 -04:00
parent 6f67bfe5ab
commit 45b2a8eee2
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
render/gles2/renderer.c
View file

@ -85,19 +85,15 @@ static const struct wlr_addon_interface buffer_addon_impl = {
.destroy = handle_buffer_destroy, .destroy = handle_buffer_destroy,
}; };
static struct wlr_gles2_buffer *get_buffer(struct wlr_gles2_renderer *renderer, static struct wlr_gles2_buffer *get_or_create_buffer(struct wlr_gles2_renderer *renderer,
struct wlr_buffer *wlr_buffer) { struct wlr_buffer *wlr_buffer) {
struct wlr_addon *addon = struct wlr_addon *addon =
wlr_addon_find(&wlr_buffer->addons, renderer, &buffer_addon_impl); wlr_addon_find(&wlr_buffer->addons, renderer, &buffer_addon_impl);
if (addon == NULL) { if (addon) {
return NULL; struct wlr_gles2_buffer *buffer = wl_container_of(addon, buffer, addon);
return buffer;
} }
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,
struct wlr_buffer *wlr_buffer) {
struct wlr_gles2_buffer *buffer = calloc(1, sizeof(*buffer)); struct wlr_gles2_buffer *buffer = calloc(1, sizeof(*buffer));
if (buffer == NULL) { if (buffer == NULL) {
wlr_log_errno(WLR_ERROR, "Allocation failed"); wlr_log_errno(WLR_ERROR, "Allocation failed");
@ -180,10 +176,7 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
wlr_egl_make_current(renderer->egl); wlr_egl_make_current(renderer->egl);
struct wlr_gles2_buffer *buffer = get_buffer(renderer, wlr_buffer); struct wlr_gles2_buffer *buffer = get_or_create_buffer(renderer, wlr_buffer);
if (buffer == NULL) {
buffer = create_buffer(renderer, wlr_buffer);
}
if (buffer == NULL) { if (buffer == NULL) {
return false; return false;
} }