nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement texture get buffer size

Browse Source
This commit is contained in:
Tony Crisci 2017-08-14 13:28:59 -04:00
parent f0f190bfa5
commit 72a33b736f
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wlr/render/interface.h
View File

@ -46,6 +46,8 @@ struct wlr_texture_impl {
struct wl_resource *drm_buf); struct wl_resource *drm_buf);
void (*get_matrix)(struct wlr_texture *state, void (*get_matrix)(struct wlr_texture *state,
float (*matrix)[16], const float (*projection)[16], int x, int y); float (*matrix)[16], const float (*projection)[16], int x, int y);
void (*get_buffer_size)(struct wlr_texture *texture,
struct wl_resource *resource, int *width, int *height);
void (*bind)(struct wlr_texture *texture); void (*bind)(struct wlr_texture *texture);
void (*destroy)(struct wlr_texture *texture); void (*destroy)(struct wlr_texture *texture);
}; };
@ -53,5 +55,7 @@ struct wlr_texture_impl {
void wlr_texture_init(struct wlr_texture *texture, void wlr_texture_init(struct wlr_texture *texture,
struct wlr_texture_impl *impl); struct wlr_texture_impl *impl);
void wlr_texture_bind(struct wlr_texture *texture); void wlr_texture_bind(struct wlr_texture *texture);
void wlr_texture_get_buffer_size(struct wlr_texture *texture,
struct wl_resource *resource, int *width, int *height);
#endif #endif

13
render/gles2/texture.c
View File

@ -218,6 +218,18 @@ static void gles2_texture_get_matrix(struct wlr_texture *_texture,
wlr_matrix_mul(projection, matrix, matrix); wlr_matrix_mul(projection, matrix, matrix);
} }
static void gles2_texture_get_buffer_size(struct wlr_texture *texture, struct
wl_resource *resource, int *width, int *height) {
struct wl_shm_buffer *buffer = wl_shm_buffer_get(resource);
if (!buffer) {
wlr_log(L_ERROR, "getting buffer size is only implemented for shm buffers");
return;
}
*width = wl_shm_buffer_get_width(buffer);
*height = wl_shm_buffer_get_height(buffer);
}
static void gles2_texture_bind(struct wlr_texture *_texture) { static void gles2_texture_bind(struct wlr_texture *_texture) {
struct wlr_gles2_texture *texture = (struct wlr_gles2_texture *)_texture; struct wlr_gles2_texture *texture = (struct wlr_gles2_texture *)_texture;
GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id)); GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
@ -247,6 +259,7 @@ static struct wlr_texture_impl wlr_texture_impl = {
.update_shm = gles2_texture_update_shm, .update_shm = gles2_texture_update_shm,
.upload_drm = gles2_texture_upload_drm, .upload_drm = gles2_texture_upload_drm,
.get_matrix = gles2_texture_get_matrix, .get_matrix = gles2_texture_get_matrix,
.get_buffer_size = gles2_texture_get_buffer_size,
.bind = gles2_texture_bind, .bind = gles2_texture_bind,
.destroy = gles2_texture_destroy, .destroy = gles2_texture_destroy,
}; };

5
render/wlr_texture.c
View File

@ -52,3 +52,8 @@ void wlr_texture_get_matrix(struct wlr_texture *texture,
float (*matrix)[16], const float (*projection)[16], int x, int y) { float (*matrix)[16], const float (*projection)[16], int x, int y) {
texture->impl->get_matrix(texture, matrix, projection, x, y); texture->impl->get_matrix(texture, matrix, projection, x, y);
} }
void wlr_texture_get_buffer_size(struct wlr_texture *texture, struct wl_resource
*resource, int *width, int *height) {
texture->impl->get_buffer_size(texture, resource, width, height);
}

12
types/wlr_surface.c
View File

@ -126,6 +126,9 @@ static void surface_commit(struct wl_client *client,
surface->current.buffer = surface->pending.buffer; surface->current.buffer = surface->pending.buffer;
} }
if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) { if ((surface->pending.invalid & WLR_SURFACE_INVALID_SURFACE_DAMAGE)) {
int width, height;
wlr_texture_get_buffer_size(surface->texture, surface->current.buffer, &width, &height);
pixman_region32_union(&surface->current.surface_damage, pixman_region32_union(&surface->current.surface_damage,
&surface->current.surface_damage, &surface->current.surface_damage,
&surface->pending.surface_damage); &surface->pending.surface_damage);
@ -140,16 +143,9 @@ static void surface_commit(struct wl_client *client,
pixman_region32_union(&surface->current.buffer_damage, pixman_region32_union(&surface->current.buffer_damage,
&surface->current.buffer_damage, &buffer_damage); &surface->current.buffer_damage, &buffer_damage);
struct wl_shm_buffer *buffer = wl_shm_buffer_get(surface->current.buffer);
pixman_region32_intersect_rect(&surface->current.buffer_damage, pixman_region32_intersect_rect(&surface->current.buffer_damage,
&surface->current.buffer_damage, 0, 0, &surface->current.buffer_damage, 0, 0, width, height);
wl_shm_buffer_get_width(buffer),
wl_shm_buffer_get_height(buffer));
// TODO: Surface sizing is complicated
//pixman_region32_intersect_rect(&surface->current.surface_damage,
// &surface->current.surface_damage,
// 0, 0, surface->width, surface->height);
pixman_region32_clear(&surface->pending.surface_damage); pixman_region32_clear(&surface->pending.surface_damage);
pixman_region32_clear(&surface->pending.buffer_damage); pixman_region32_clear(&surface->pending.buffer_damage);
} }