mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused surface->buffer field

Browse Source 
If we make sure the link is either on a list or initialized, we can alway
just remove it.
This commit is contained in:
Kristian Høgsberg
2011-05-02 13:35:17 -04:00
parent 080ab6c1be
commit fac11d25e4
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+2 -5
View File
@@ -181,7 +181,6 @@ wlsc_surface_create(struct wlsc_compositor *compositor,
surface->visual = NULL; surface->visual = NULL;
surface->image = EGL_NO_IMAGE_KHR; surface->image = EGL_NO_IMAGE_KHR;
surface->saved_texture = 0; surface->saved_texture = 0;
surface->buffer = NULL;
surface->x = x; surface->x = x;
surface->y = y; surface->y = y;
surface->width = width; surface->width = width;
@@ -286,8 +285,7 @@ wlsc_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
surfaces_attached_to = buffer->user_data; surfaces_attached_to = buffer->user_data;
if (es->buffer) wl_list_remove(&es->buffer_link);
wl_list_remove(&es->buffer_link);
wl_list_insert(surfaces_attached_to, &es->buffer_link); wl_list_insert(surfaces_attached_to, &es->buffer_link);
} else { } else {
es->image = ec->create_image(ec->display, NULL, es->image = ec->create_image(ec->display, NULL,
@@ -840,7 +838,6 @@ surface_attach(struct wl_client *client,
wlsc_buffer_attach(buffer, surface); wlsc_buffer_attach(buffer, surface);
es->buffer = buffer;
switch (es->map_type) { switch (es->map_type) {
case WLSC_SURFACE_MAP_FULLSCREEN: case WLSC_SURFACE_MAP_FULLSCREEN:
es->x = (es->fullscreen_output->width - es->width) / 2; es->x = (es->fullscreen_output->width - es->width) / 2;
@@ -1765,8 +1762,8 @@ shm_buffer_destroyed(struct wl_buffer *buffer)
struct wlsc_surface *es, *next; struct wlsc_surface *es, *next;
wl_list_for_each_safe(es, next, surfaces_attached_to, buffer_link) { wl_list_for_each_safe(es, next, surfaces_attached_to, buffer_link) {
es->buffer = NULL;
wl_list_remove(&es->buffer_link); wl_list_remove(&es->buffer_link);
wl_list_init(&es->buffer_link);
} }
free(surfaces_attached_to); free(surfaces_attached_to);
compositor/compositor.h
-1
View File
@@ -213,7 +213,6 @@ struct wlsc_surface {
struct wlsc_matrix matrix; struct wlsc_matrix matrix;
struct wlsc_matrix matrix_inv; struct wlsc_matrix matrix_inv;
struct wl_visual *visual; struct wl_visual *visual;
struct wl_buffer *buffer;
struct wlsc_output *output; struct wlsc_output *output;
enum wlsc_surface_map_type map_type; enum wlsc_surface_map_type map_type;
struct wlsc_output *fullscreen_output; struct wlsc_output *fullscreen_output;