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

render/gles2: Inline texture invalidation

Browse source 
Let's us share more code with the other code path
This commit is contained in:
Alexander Orzechowski 2023-06-25 05:40:24 -04:00
parent 9bf51e744e
commit 84bef5c0c2
1 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
render/gles2/texture.c
View file

@ -106,33 +106,6 @@ static bool gles2_texture_update_from_buffer(struct wlr_texture *wlr_texture,
return true; return true;
} }
static bool gles2_texture_invalidate(struct wlr_gles2_texture *texture) {
if (!texture->buffer) {
return false;
}
if (texture->target == GL_TEXTURE_EXTERNAL_OES) {
// External changes are immediately made visible by the GL implementation
return true;
}
struct wlr_egl_context prev_ctx;
wlr_egl_save_context(&prev_ctx);
wlr_egl_make_current(texture->renderer->egl);
push_gles2_debug(texture->renderer);
glBindTexture(texture->target, texture->tex);
texture->renderer->procs.glEGLImageTargetTexture2DOES(texture->target,
texture->buffer->image);
glBindTexture(texture->target, 0);
pop_gles2_debug(texture->renderer);
wlr_egl_restore_context(&prev_ctx);
return true;
}
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) {
@ -265,6 +238,7 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
const struct wlr_pixel_format_info *drm_fmt = const struct wlr_pixel_format_info *drm_fmt =
drm_get_pixel_format_info(attribs->format); drm_get_pixel_format_info(attribs->format);
texture->target = buffer->external_only ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
texture->buffer = buffer; texture->buffer = buffer;
texture->drm_format = DRM_FORMAT_INVALID; // texture can't be written anyways texture->drm_format = DRM_FORMAT_INVALID; // texture can't be written anyways
texture->has_alpha = drm_fmt ? drm_fmt->has_alpha : true; texture->has_alpha = drm_fmt ? drm_fmt->has_alpha : true;
@ -272,28 +246,29 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
struct wlr_egl_context prev_ctx; struct wlr_egl_context prev_ctx;
wlr_egl_save_context(&prev_ctx); wlr_egl_save_context(&prev_ctx);
wlr_egl_make_current(renderer->egl); wlr_egl_make_current(renderer->egl);
push_gles2_debug(texture->renderer);
texture->target = buffer->external_only ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D; bool invalid;
if (!buffer->tex) {
if (buffer->tex) { glGenTextures(1, &buffer->tex);
texture->tex = buffer->tex; invalid = true;
gles2_texture_invalidate(texture);
} else { } else {
push_gles2_debug(renderer); // External changes are immediately made visible by the GL implementation
invalid = !buffer->external_only;
}
glGenTextures(1, &texture->tex); if (invalid) {
glBindTexture(texture->target, texture->tex); glBindTexture(texture->target, buffer->tex);
glTexParameteri(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
renderer->procs.glEGLImageTargetTexture2DOES(texture->target, buffer->image); renderer->procs.glEGLImageTargetTexture2DOES(texture->target, buffer->image);
glBindTexture(texture->target, 0); glBindTexture(texture->target, 0);
pop_gles2_debug(renderer);
buffer->tex = texture->tex;
} }
pop_gles2_debug(texture->renderer);
wlr_egl_restore_context(&prev_ctx); wlr_egl_restore_context(&prev_ctx);
texture->tex = buffer->tex;
wlr_buffer_lock(texture->buffer->buffer); wlr_buffer_lock(texture->buffer->buffer);
return &texture->wlr_texture; return &texture->wlr_texture;
} }