blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup wlr_surface.[ch]

This commit is contained in:
Tony Crisci 2017-09-24 08:25:53 -04:00
parent 68eeebc647
commit 7f39578824
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wlr/types/wlr_surface.h
View File

@ -54,8 +54,8 @@ struct wlr_surface {
} signals; } signals;
struct wl_list frame_callback_list; // wl_surface.frame struct wl_list frame_callback_list; // wl_surface.frame
// destroy listener used by compositor
struct wl_listener compositor_listener; // destroy listener used by compositor struct wl_listener compositor_listener;
void *compositor_data; void *compositor_data;
// subsurface properties // subsurface properties

6
types/wlr_surface.c
View File

@ -7,7 +7,8 @@
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/render/matrix.h> #include <wlr/render/matrix.h>
static void surface_destroy(struct wl_client *client, struct wl_resource *resource) { static void surface_destroy(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
@ -282,7 +283,8 @@ void wlr_surface_flush_damage(struct wlr_surface *surface) {
} }
struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current.buffer); struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current.buffer);
if (!buffer) { if (!buffer) {
if (wlr_renderer_buffer_is_drm(surface->renderer, surface->pending.buffer)) { if (wlr_renderer_buffer_is_drm(surface->renderer,
surface->pending.buffer)) {
wlr_texture_upload_drm(surface->texture, surface->pending.buffer); wlr_texture_upload_drm(surface->texture, surface->pending.buffer);
goto release; goto release;
} else { } else {