fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 06:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compositor.c
View file

@ -195,7 +195,6 @@ weston_surface_create(struct weston_compositor *compositor,
surface->visual = WESTON_NONE_VISUAL;
surface->shader = &compositor->texture_shader;
surface->image = EGL_NO_IMAGE_KHR;
surface->saved_texture = 0;
surface->x = x;
surface->y = y;
surface->width = width;
@ -367,10 +366,7 @@ destroy_surface(struct wl_resource *resource)
wl_list_remove(&surface->link);
weston_compositor_repick(compositor);
if (surface->saved_texture == 0)
glDeleteTextures(1, &surface->texture);
else
glDeleteTextures(1, &surface->saved_texture);
glDeleteTextures(1, &surface->texture);
if (surface->buffer)
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 wl_list *surfaces_attached_to;
if (es->saved_texture != 0)
es->texture = es->saved_texture;
glBindTexture(GL_TEXTURE_2D, es->texture);
if (wl_buffer_is_shm(buffer)) {

2
src/compositor.h
View file

@ -226,7 +226,7 @@ enum weston_output_flags {
struct weston_surface {
struct wl_surface surface;
struct weston_compositor *compositor;
GLuint texture, saved_texture;
GLuint texture;
pixman_region32_t damage;
pixman_region32_t opaque;
int32_t x, y, width, height;