aboutsummaryrefslogtreecommitdiff
path: root/render/gles2
diff options
context:
space:
mode:
authorAlexander Orzechowski <alex@ozal.ski>2023-06-25 05:40:24 -0400
committerAlexander Orzechowski <alex@ozal.ski>2023-11-30 10:13:18 -0500
commit84bef5c0c23ea54351c16ab3bc79edc8aa498b93 (patch)
treeed587424741dc63710585a1c7b42d7d98ac3a7d1 /render/gles2
parent9bf51e744e257398baaf5c42dace7e933c1a780d (diff)
render/gles2: Inline texture invalidation
Let's us share more code with the other code path
Diffstat (limited to 'render/gles2')
-rw-r--r--render/gles2/texture.c51
1 files changed, 13 insertions, 38 deletions
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index b8edf9cd..51c6290d 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -106,33 +106,6 @@ static bool gles2_texture_update_from_buffer(struct wlr_texture *wlr_texture,
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) {
wl_list_remove(&texture->link);
if (texture->buffer != NULL) {
@@ -265,6 +238,7 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
const struct wlr_pixel_format_info *drm_fmt =
drm_get_pixel_format_info(attribs->format);
+ texture->target = buffer->external_only ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
texture->buffer = buffer;
texture->drm_format = DRM_FORMAT_INVALID; // texture can't be written anyways
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;
wlr_egl_save_context(&prev_ctx);
wlr_egl_make_current(renderer->egl);
+ push_gles2_debug(texture->renderer);
- texture->target = buffer->external_only ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
-
- if (buffer->tex) {
- texture->tex = buffer->tex;
- gles2_texture_invalidate(texture);
+ bool invalid;
+ if (!buffer->tex) {
+ glGenTextures(1, &buffer->tex);
+ invalid = true;
} else {
- push_gles2_debug(renderer);
+ // External changes are immediately made visible by the GL implementation
+ invalid = !buffer->external_only;
+ }
- glGenTextures(1, &texture->tex);
- glBindTexture(texture->target, texture->tex);
+ if (invalid) {
+ glBindTexture(texture->target, buffer->tex);
glTexParameteri(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
renderer->procs.glEGLImageTargetTexture2DOES(texture->target, buffer->image);
glBindTexture(texture->target, 0);
-
- pop_gles2_debug(renderer);
- buffer->tex = texture->tex;
}
+ pop_gles2_debug(texture->renderer);
wlr_egl_restore_context(&prev_ctx);
+ texture->tex = buffer->tex;
wlr_buffer_lock(texture->buffer->buffer);
return &texture->wlr_texture;
}