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

render/gles2: Don't attach texture as buffer addon

Browse source 
Since wlr_gles2_buffer is now managing importing for us, there is
no reason for us to continue doing this.
This commit is contained in:
Alexander Orzechowski 2023-06-24 01:52:30 -04:00
parent 829e34b305
commit 9bf51e744e
2 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/render/gles2.h
View file

@ -131,7 +131,6 @@ struct wlr_gles2_texture {
uint32_t drm_format; // used to interpret upload data uint32_t drm_format; // used to interpret upload data
// If imported from a wlr_buffer // If imported from a wlr_buffer
struct wlr_gles2_buffer *buffer; struct wlr_gles2_buffer *buffer;
struct wlr_addon buffer_addon;
}; };
struct wlr_gles2_render_pass { struct wlr_gles2_render_pass {

41
render/gles2/texture.c
View file

@ -136,7 +136,7 @@ static bool gles2_texture_invalidate(struct wlr_gles2_texture *texture) {
void gles2_texture_destroy(struct wlr_gles2_texture *texture) { void gles2_texture_destroy(struct wlr_gles2_texture *texture) {
wl_list_remove(&texture->link); wl_list_remove(&texture->link);
if (texture->buffer != NULL) { if (texture->buffer != NULL) {
wlr_addon_finish(&texture->buffer_addon); wlr_buffer_unlock(texture->buffer->buffer);
} }
if (texture->owns_tex) { if (texture->owns_tex) {
@ -156,20 +156,13 @@ void gles2_texture_destroy(struct wlr_gles2_texture *texture) {
free(texture); free(texture);
} }
static void gles2_texture_unref(struct wlr_texture *wlr_texture) { static void handle_gles2_texture_destroy(struct wlr_texture *wlr_texture) {
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture); gles2_texture_destroy(gles2_get_texture(wlr_texture));
if (texture->buffer != NULL) {
// Keep the texture around, in case the buffer is re-used later. We're
// still listening to the buffer's destroy event.
wlr_buffer_unlock(texture->buffer->buffer);
} else {
gles2_texture_destroy(texture);
}
} }
static const struct wlr_texture_impl texture_impl = { static const struct wlr_texture_impl texture_impl = {
.update_from_buffer = gles2_texture_update_from_buffer, .update_from_buffer = gles2_texture_update_from_buffer,
.destroy = gles2_texture_unref, .destroy = handle_gles2_texture_destroy,
}; };
static struct wlr_gles2_texture *gles2_texture_create( static struct wlr_gles2_texture *gles2_texture_create(
@ -251,17 +244,6 @@ static struct wlr_texture *gles2_texture_from_pixels(
return &texture->wlr_texture; return &texture->wlr_texture;
} }
static void texture_handle_buffer_destroy(struct wlr_addon *addon) {
struct wlr_gles2_texture *texture =
wl_container_of(addon, texture, buffer_addon);
gles2_texture_destroy(texture);
}
static const struct wlr_addon_interface texture_addon_impl = {
.name = "wlr_gles2_texture",
.destroy = texture_handle_buffer_destroy,
};
static struct wlr_texture *gles2_texture_from_dmabuf( static struct wlr_texture *gles2_texture_from_dmabuf(
struct wlr_gles2_renderer *renderer, struct wlr_buffer *wlr_buffer, struct wlr_gles2_renderer *renderer, struct wlr_buffer *wlr_buffer,
struct wlr_dmabuf_attributes *attribs) { struct wlr_dmabuf_attributes *attribs) {
@ -269,19 +251,6 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
return NULL; return NULL;
} }
struct wlr_addon *addon =
wlr_addon_find(&wlr_buffer->addons, renderer, &texture_addon_impl);
if (addon != NULL) {
struct wlr_gles2_texture *texture =
wl_container_of(addon, texture, buffer_addon);
if (!gles2_texture_invalidate(texture)) {
wlr_log(WLR_ERROR, "Failed to invalidate texture");
return false;
}
wlr_buffer_lock(texture->buffer->buffer);
return &texture->wlr_texture;
}
struct wlr_gles2_buffer *buffer = gles2_buffer_get_or_create(renderer, wlr_buffer); struct wlr_gles2_buffer *buffer = gles2_buffer_get_or_create(renderer, wlr_buffer);
if (!buffer) { if (!buffer) {
return NULL; return NULL;
@ -326,8 +295,6 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
wlr_egl_restore_context(&prev_ctx); wlr_egl_restore_context(&prev_ctx);
wlr_buffer_lock(texture->buffer->buffer); wlr_buffer_lock(texture->buffer->buffer);
wlr_addon_init(&texture->buffer_addon, &wlr_buffer->addons,
renderer, &texture_addon_impl);
return &texture->wlr_texture; return &texture->wlr_texture;
} }