fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-09 05:58:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: Add EXT_EGL_image_storage support

Browse source 
EXT_EGL_image_storage provides a mechanism for creating texture
objects that are both EGL image targets and immutable. When available,
this makes the texture object target immutable, preventing
respecifications.

While adding support for that extension, it appeared that the
compositor calls attach_buffer() at every buffer updates and that the
texture object is each time respecified to the same EGL image. This
commit additionally prevents any respecification when
EXT_EGL_image_storage isn't available.

Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-11-25 19:03:55 +01:00 • committed by Daniel Stone
parent c112760368
commit acc40ce2bb
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libweston/renderer-gl/gl-renderer-internal.h
View file

@ -126,6 +126,7 @@ enum gl_extension_flag {
EXTENSION_EXT_COLOR_BUFFER_FLOAT = 1ull << 5,
EXTENSION_EXT_COLOR_BUFFER_HALF_FLOAT = 1ull << 6,
EXTENSION_EXT_DISJOINT_TIMER_QUERY = 1ull << 7,
EXTENSION_EXT_EGL_IMAGE_STORAGE = 1ull << 8,
EXTENSION_EXT_MAP_BUFFER_RANGE = 1ull << 9,
EXTENSION_EXT_READ_FORMAT_BGRA = 1ull << 10,
EXTENSION_EXT_TEXTURE_FORMAT_BGRA8888 = 1ull << 11,
@ -425,6 +426,9 @@ struct gl_renderer {
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC image_target_texture_2d;
PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC image_target_renderbuffer_storage;
/* GL_EXT_EGL_image_storage */
PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC image_target_tex_storage;
/* GL_OES_mapbuffer */
PFNGLUNMAPBUFFEROESPROC unmap_buffer;

23
libweston/renderer-gl/gl-renderer.c
View file

@ -246,6 +246,8 @@ struct gl_buffer_state {
GLuint textures[3];
int num_textures;
bool specified;
struct wl_listener destroy_listener;
};
@ -284,6 +286,7 @@ static const struct gl_extension_table extension_table[] = {
EXT("GL_EXT_color_buffer_float", EXTENSION_EXT_COLOR_BUFFER_FLOAT),
EXT("GL_EXT_color_buffer_half_float", EXTENSION_EXT_COLOR_BUFFER_HALF_FLOAT),
EXT("GL_EXT_disjoint_timer_query", EXTENSION_EXT_DISJOINT_TIMER_QUERY),
EXT("GL_EXT_EGL_image_storage", EXTENSION_EXT_EGL_IMAGE_STORAGE),
EXT("GL_EXT_map_buffer_range", EXTENSION_EXT_MAP_BUFFER_RANGE),
EXT("GL_EXT_read_format_bgra", EXTENSION_EXT_READ_FORMAT_BGRA),
EXT("GL_EXT_texture_format_BGRA8888", EXTENSION_EXT_TEXTURE_FORMAT_BGRA8888),
@ -3529,13 +3532,20 @@ gl_renderer_attach_buffer(struct weston_surface *surface,
gs->buffer = gb;
if (gb->specified)
return;
target = gl_shader_texture_variant_get_target(gb->shader_variant);
for (i = 0; i < gb->num_images; ++i) {
glActiveTexture(GL_TEXTURE0 + i);
glBindTexture(target, gb->textures[i]);
gr->image_target_texture_2d(target, gb->images[i]);
if (gl_extensions_has(gr, EXTENSION_EXT_EGL_IMAGE_STORAGE))
gr->image_target_tex_storage(target, gb->images[i],
NULL);
else
gr->image_target_texture_2d(target, gb->images[i]);
}
glActiveTexture(GL_TEXTURE0);
gb->specified = true;
}
static const struct weston_drm_format_array *
@ -4731,10 +4741,9 @@ gl_renderer_setup(struct weston_compositor *ec)
"glEGLImageTargetRenderbufferStorageOES");
}
if (!gl_extensions_has(gr, EXTENSION_EXT_TEXTURE_FORMAT_BGRA8888)) {
weston_log("GL_EXT_texture_format_BGRA8888 not available\n");
return -1;
}
if (gl_extensions_has(gr, EXTENSION_EXT_EGL_IMAGE_STORAGE))
GET_PROC_ADDRESS(gr->image_target_tex_storage,
"glEGLImageTargetTexStorageEXT");
if (gl_extensions_has(gr, EXTENSION_EXT_READ_FORMAT_BGRA))
ec->read_format = pixel_format_get_info(DRM_FORMAT_ARGB8888);