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

compositor: Drop unused saved_texture surface field

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-01-26 09:28:42 -05:00
parent 2200d70e56
commit 46e64ee3e1
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+1 -8
View File
@@ -195,7 +195,6 @@ weston_surface_create(struct weston_compositor *compositor,
surface->visual = WESTON_NONE_VISUAL; surface->visual = WESTON_NONE_VISUAL;
surface->shader = &compositor->texture_shader; surface->shader = &compositor->texture_shader;
surface->image = EGL_NO_IMAGE_KHR; surface->image = EGL_NO_IMAGE_KHR;
surface->saved_texture = 0;
surface->x = x; surface->x = x;
surface->y = y; surface->y = y;
surface->width = width; surface->width = width;
@@ -367,10 +366,7 @@ destroy_surface(struct wl_resource *resource)
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
weston_compositor_repick(compositor); weston_compositor_repick(compositor);
if (surface->saved_texture == 0) glDeleteTextures(1, &surface->texture);
glDeleteTextures(1, &surface->texture);
else
glDeleteTextures(1, &surface->saved_texture);
if (surface->buffer) if (surface->buffer)
wl_list_remove(&surface->buffer_destroy_listener.link); wl_list_remove(&surface->buffer_destroy_listener.link);
@@ -394,9 +390,6 @@ weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
struct weston_compositor *ec = es->compositor; struct weston_compositor *ec = es->compositor;
struct wl_list *surfaces_attached_to; struct wl_list *surfaces_attached_to;
if (es->saved_texture != 0)
es->texture = es->saved_texture;
glBindTexture(GL_TEXTURE_2D, es->texture); glBindTexture(GL_TEXTURE_2D, es->texture);
if (wl_buffer_is_shm(buffer)) { if (wl_buffer_is_shm(buffer)) {
src/compositor.h
+1 -1
View File
@@ -226,7 +226,7 @@ enum weston_output_flags {
struct weston_surface { struct weston_surface {
struct wl_surface surface; struct wl_surface surface;
struct weston_compositor *compositor; struct weston_compositor *compositor;
GLuint texture, saved_texture; GLuint texture;
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_t opaque; pixman_region32_t opaque;
int32_t x, y, width, height; int32_t x, y, width, height;