mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-23 06:59:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into drm_buffer

Browse source
This commit is contained in:
Drew DeVault 2017-08-10 13:19:39 -04:00
commit 7095274a9e
8 changed files with 80 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
types/wlr_region.c
View file

@ -37,8 +37,23 @@ static void destroy_region(struct wl_resource *resource) {
free(reg);
}
void wlr_region_create(struct wl_resource *res) {
void wlr_region_create(struct wl_client *client, struct wl_resource *res,
uint32_t id) {
pixman_region32_t *region = calloc(1, sizeof(pixman_region32_t));
if (region == NULL) {
wl_resource_post_no_memory(res);
return;
}
pixman_region32_init(region);
wl_resource_set_implementation(res, &region_interface, region, destroy_region);
struct wl_resource *region_resource = wl_resource_create(client,
&wl_region_interface, 1, id);
if (region_resource == NULL) {
free(region);
wl_resource_post_no_memory(res);
return;
}
wl_resource_set_implementation(region_resource, &region_interface, region,
destroy_region);
}

56
types/wlr_surface.c
View file

@ -4,6 +4,7 @@
#include <wlr/util/log.h>
#include <wlr/render/interface.h>
#include <wlr/types/wlr_surface.h>
#include "backend/egl.h"
static void surface_destroy(struct wl_client *client, struct wl_resource *resource) {
wl_resource_destroy(resource);
@ -95,20 +96,6 @@ static void surface_commit(struct wl_client *client,
if ((surface->pending.invalid & WLR_SURFACE_INVALID_BUFFER)) {
surface->current.buffer = surface->pending.buffer;
// TODO: Move to wlr_surface_flush_damage and call from output frame
// callbacks instead of immediately here
if (surface->current.buffer) {
struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current.buffer);
if (buffer) {
uint32_t format = wl_shm_buffer_get_format(buffer);
wlr_texture_upload_shm(surface->texture, format, buffer);
wl_resource_queue_event(surface->current.buffer, WL_BUFFER_RELEASE);
} else if (wlr_texture_upload_drm(surface->texture, surface->pending.buffer)) {
wl_resource_queue_event(surface->current.buffer, WL_BUFFER_RELEASE);
} else {
wlr_log(L_INFO, "Unknown buffer handle attached");
}
}
}
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) {
// TODO: Sort out buffer damage too
@ -128,6 +115,47 @@ static void surface_commit(struct wl_client *client,
wl_signal_emit(&surface->signals.commit, surface);
}
void wlr_surface_flush_damage(struct wlr_surface *surface) {
if (!surface->current.buffer) {
if (surface->texture->valid) {
// TODO: Detach buffers
}
return;
}
struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current.buffer);
if (!buffer) {
EGLint format;
if (wlr_egl_query_buffer(surface->current.buffer, EGL_TEXTURE_FORMAT, &format)) {
wlr_texture_upload_drm(surface->texture, surface->pending.buffer);
goto release;
} else {
wlr_log(L_INFO, "Unknown buffer handle attached");
return;
}
}
pixman_region32_t damage = surface->current.surface_damage;
if (!pixman_region32_not_empty(&damage)) {
goto release;
}
int n;
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &n);
uint32_t format = wl_shm_buffer_get_format(buffer);
for (int i = 0; i < n; ++i) {
pixman_box32_t rect = rects[i];
if (!wlr_texture_update_shm(surface->texture, format,
rect.x1, rect.y1,
rect.x2 - rect.x1,
rect.y2 - rect.y1,
buffer)) {
break;
}
}
pixman_region32_fini(&surface->current.surface_damage);
pixman_region32_init(&surface->current.surface_damage);
release:
wl_resource_queue_event(surface->current.buffer, WL_BUFFER_RELEASE);
}
static void surface_set_buffer_transform(struct wl_client *client,
struct wl_resource *resource, int transform) {
wlr_log(L_DEBUG, "TODO: surface surface buffer transform");