mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Merge duplicated functions 

Merge duplicated gl_renderer_attach_dmabuf() and
gl_renderer_attach_egl() functions into a single
gl_renderer_attach_buffer() one.

Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-07-23 12:32:04 +02:00 committed by Daniel Stone
parent 9a754434f1
commit 8a9fba9827
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libweston/renderer-gl/gl-renderer.c
View File

@ -2933,28 +2933,6 @@ err_free:
return false; return false;
} }
static void
gl_renderer_attach_egl(struct weston_surface *es, struct weston_buffer *buffer)
{
struct weston_compositor *ec = es->compositor;
struct gl_renderer *gr = get_renderer(ec);
struct gl_surface_state *gs = get_surface_state(es);
struct gl_buffer_state *gb = buffer->renderer_private;
GLenum target;
int i;
assert(gb);
gs->buffer = gb;
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]);
}
}
static void static void
gl_renderer_destroy_dmabuf(struct linux_dmabuf_buffer *dmabuf) gl_renderer_destroy_dmabuf(struct linux_dmabuf_buffer *dmabuf)
{ {
@ -3458,9 +3436,8 @@ attach_direct_display_placeholder(struct weston_paint_node *pnode)
gb->shader_variant = SHADER_VARIANT_SOLID; gb->shader_variant = SHADER_VARIANT_SOLID;
} }
static void
static bool gl_renderer_attach_buffer(struct weston_surface *surface,
gl_renderer_attach_dmabuf(struct weston_surface *surface,
struct weston_buffer *buffer) struct weston_buffer *buffer)
{ {
struct gl_renderer *gr = get_renderer(surface->compositor); struct gl_renderer *gr = get_renderer(surface->compositor);
@ -3480,8 +3457,6 @@ gl_renderer_attach_dmabuf(struct weston_surface *surface,
glBindTexture(target, gb->textures[i]); glBindTexture(target, gb->textures[i]);
gr->image_target_texture_2d(target, gb->images[i]); gr->image_target_texture_2d(target, gb->images[i]);
} }
return true;
} }
static const struct weston_drm_format_array * static const struct weston_drm_format_array *
@ -3607,10 +3582,8 @@ gl_renderer_attach(struct weston_paint_node *pnode)
gl_renderer_attach_shm(es, buffer); gl_renderer_attach_shm(es, buffer);
break; break;
case WESTON_BUFFER_DMABUF: case WESTON_BUFFER_DMABUF:
gl_renderer_attach_dmabuf(es, buffer);
break;
case WESTON_BUFFER_RENDERER_OPAQUE: case WESTON_BUFFER_RENDERER_OPAQUE:
gl_renderer_attach_egl(es, buffer); gl_renderer_attach_buffer(es, buffer);
break; break;
case WESTON_BUFFER_SOLID: case WESTON_BUFFER_SOLID:
gl_renderer_attach_solid(es, buffer); gl_renderer_attach_solid(es, buffer);