From 4de930542f1a3d7322e7a7c1d2dc43dc9b4a4129 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 9 Aug 2017 22:17:40 -0400 Subject: [PATCH] Implement partial texture uploads --- include/wlr/render.h | 24 ++++++++++--- include/wlr/render/interface.h | 5 +++ render/gles2/texture.c | 62 +++++++++++++++++++++++++++++++++- render/wlr_texture.c | 13 +++++++ types/wlr_surface.c | 2 +- 5 files changed, 100 insertions(+), 6 deletions(-) diff --git a/include/wlr/render.h b/include/wlr/render.h index 3dcc482c..61169333 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -62,18 +62,34 @@ struct wlr_texture { }; /** - * Uploads a pixel buffer to this texture. The buffer may be discarded after - * calling this function. + * Copies pixels to this texture. The buffer is not accessed after this function + * returns. */ bool wlr_texture_upload_pixels(struct wlr_texture *surf, enum wl_shm_format format, int stride, int width, int height, const unsigned char *pixels); /** - * Uploads pixels from a wl_shm_buffer to this texture. The shm buffer may be - * invalidated after calling this function. + * Copies pixels to this texture. The buffer is not accessed after this function + * returns. Under some circumstances, this function may re-upload the entire + * buffer - therefore, the entire buffer must be valid. + */ +bool wlr_texture_update_pixels(struct wlr_texture *surf, + enum wl_shm_format format, int stride, int x, int y, + int width, int height, const unsigned char *pixels); +/** + * Copies pixels from a wl_shm_buffer into this texture. The buffer is not + * accessed after this function returns. */ bool wlr_texture_upload_shm(struct wlr_texture *surf, uint32_t format, struct wl_shm_buffer *shm); +/** + * Copies a rectangle of pixels from a wl_shm_buffer onto the texture. The + * buffer is not accessed after this function returns. Under some circumstances, + * this function may re-upload the entire buffer - therefore, the entire buffer + * must be valid. + */ +bool wlr_texture_update_shm(struct wlr_texture *surf, uint32_t format, + int x, int y, int width, int height, struct wl_shm_buffer *shm); /** * Prepares a matrix with the appropriate scale for the given texture and * multiplies it with the projection, producing a matrix that the shader can diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 83e34625..be9ffe7a 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -35,8 +35,13 @@ struct wlr_texture_impl { bool (*upload_pixels)(struct wlr_texture_state *state, enum wl_shm_format format, int stride, int width, int height, const unsigned char *pixels); + bool (*update_pixels)(struct wlr_texture_state *state, + enum wl_shm_format format, int stride, int x, int y, + int width, int height, const unsigned char *pixels); bool (*upload_shm)(struct wlr_texture_state *state, uint32_t format, struct wl_shm_buffer *shm); + bool (*update_shm)(struct wlr_texture_state *surf, uint32_t format, + int x, int y, int width, int height, struct wl_shm_buffer *shm); // TODO: egl void (*get_matrix)(struct wlr_texture_state *state, float (*matrix)[16], const float (*projection)[16], int x, int y); diff --git a/render/gles2/texture.c b/render/gles2/texture.c index bd588898..ff823fc1 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -29,11 +29,36 @@ static bool gles2_texture_upload_pixels(struct wlr_texture_state *texture, GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride)); GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0, fmt->gl_format, fmt->gl_type, pixels)); - GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0)); texture->wlr_texture->valid = true; return true; } +static bool gles2_texture_update_pixels(struct wlr_texture_state *texture, + enum wl_shm_format format, int stride, int x, int y, + int width, int height, const unsigned char *pixels) { + assert(texture && texture->wlr_texture->valid); + // TODO: Test if the unpack subimage extension is supported and adjust the + // upload strategy if not + if (texture->wlr_texture->format != format) { + return gles2_texture_upload_pixels(texture, format, stride, + width, height, pixels); + } + const struct pixel_format *fmt = gl_format_for_wl_format(format); + if (!fmt || !fmt->gl_format) { + wlr_log(L_ERROR, "No supported pixel format for this texture"); + return false; + } + GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id)); + GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, y)); + GL_CALL(glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, + fmt->gl_format, fmt->gl_type, pixels)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0)); + return true; +} + static bool gles2_texture_upload_shm(struct wlr_texture_state *texture, uint32_t format, struct wl_shm_buffer *buffer) { const struct pixel_format *fmt = gl_format_for_wl_format(format); @@ -54,6 +79,8 @@ static bool gles2_texture_upload_shm(struct wlr_texture_state *texture, GL_CALL(glGenTextures(1, &texture->tex_id)); GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id)); GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0)); GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0, fmt->gl_format, fmt->gl_type, pixels)); @@ -62,6 +89,37 @@ static bool gles2_texture_upload_shm(struct wlr_texture_state *texture, return true; } +static bool gles2_texture_update_shm(struct wlr_texture_state *texture, + uint32_t format, int x, int y, int width, int height, + struct wl_shm_buffer *buffer) { + // TODO: Test if the unpack subimage extension is supported and adjust the + // upload strategy if not + assert(texture && texture->wlr_texture->valid); + if (texture->wlr_texture->format != format) { + return gles2_texture_upload_shm(texture, format, buffer); + } + const struct pixel_format *fmt = gl_format_for_wl_format(format); + if (!fmt || !fmt->gl_format) { + wlr_log(L_ERROR, "No supported pixel format for this texture"); + return false; + } + wl_shm_buffer_begin_access(buffer); + uint8_t *pixels = wl_shm_buffer_get_data(buffer); + int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8); + + GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id)); + GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, y)); + GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0, + fmt->gl_format, fmt->gl_type, pixels)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0)); + GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0)); + + wl_shm_buffer_end_access(buffer); + return true; +} + static void gles2_texture_get_matrix(struct wlr_texture_state *texture, float (*matrix)[16], const float (*projection)[16], int x, int y) { struct wlr_texture *_texture = texture->wlr_texture; @@ -89,7 +147,9 @@ static void gles2_texture_destroy(struct wlr_texture_state *texture) { static struct wlr_texture_impl wlr_texture_impl = { .upload_pixels = gles2_texture_upload_pixels, + .update_pixels = gles2_texture_update_pixels, .upload_shm = gles2_texture_upload_shm, + .update_shm = gles2_texture_update_shm, .get_matrix = gles2_texture_get_matrix, .bind = gles2_texture_bind, .destroy = gles2_texture_destroy, diff --git a/render/wlr_texture.c b/render/wlr_texture.c index 926ee546..64f90990 100644 --- a/render/wlr_texture.c +++ b/render/wlr_texture.c @@ -25,11 +25,24 @@ bool wlr_texture_upload_pixels(struct wlr_texture *texture, uint32_t format, format, stride, width, height, pixels); } +bool wlr_texture_update_pixels(struct wlr_texture *texture, + enum wl_shm_format format, int stride, int x, int y, + int width, int height, const unsigned char *pixels) { + return texture->impl->update_pixels(texture->state, + format, stride, x, y, width, height, pixels); +} + bool wlr_texture_upload_shm(struct wlr_texture *texture, uint32_t format, struct wl_shm_buffer *shm) { return texture->impl->upload_shm(texture->state, format, shm); } +bool wlr_texture_update_shm(struct wlr_texture *texture, uint32_t format, + int x, int y, int width, int height, struct wl_shm_buffer *shm) { + return texture->impl->update_shm(texture->state, format, + x, y, width, height, shm); +} + void wlr_texture_get_matrix(struct wlr_texture *texture, float (*matrix)[16], const float (*projection)[16], int x, int y) { texture->impl->get_matrix(texture->state, matrix, projection, x, y); diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 5bcf44a5..90f22a17 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -20,7 +20,7 @@ static void surface_attach(struct wl_client *client, static void surface_damage(struct wl_client *client, struct wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height) { - wlr_log(L_DEBUG, "TODO: surface damage"); + wlr_log(L_DEBUG, "damage: %dx%d@%d,%d", width, height, x, y); } static void destroy_frame_callback(struct wl_resource *resource) {