wayland: Remove width / height from MetaWaylandBuffer

They're in the texture.
This commit is contained in:
Jasper St. Pierre 2014-02-18 22:42:34 -05:00
parent f771bb88d6
commit 374e30043b
2 changed files with 4 additions and 7 deletions

View File

@ -273,8 +273,6 @@ ensure_buffer_texture (MetaWaylandBuffer *buffer)
} }
buffer->texture = texture; buffer->texture = texture;
buffer->width = cogl_texture_get_width (texture);
buffer->height = cogl_texture_get_height (texture);
} }
static void static void
@ -324,11 +322,11 @@ toplevel_surface_commit (MetaWaylandSurface *surface,
/* We resize X based surfaces according to X events */ /* We resize X based surfaces according to X events */
if (buffer != NULL && window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND) if (buffer != NULL && window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND)
{ {
int new_width; int new_width, new_height;
int new_height;
new_width = cogl_texture_get_width (buffer->texture);
new_height = cogl_texture_get_height (buffer->texture);
new_width = surface->buffer->width;
new_height = surface->buffer->height;
if (new_width != window->rect.width || if (new_width != window->rect.width ||
new_height != window->rect.height || new_height != window->rect.height ||
pending->dx != 0 || pending->dx != 0 ||

View File

@ -38,7 +38,6 @@ struct _MetaWaylandBuffer
struct wl_listener destroy_listener; struct wl_listener destroy_listener;
CoglTexture *texture; CoglTexture *texture;
int32_t width, height;
uint32_t ref_count; uint32_t ref_count;
}; };