From 5a861d5d6a260b2927a1cae10b6c0cb6e06b59b2 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Fri, 26 Jul 2019 02:02:34 +0100 Subject: [PATCH] gl_common, new glx: implement partial updates Signed-off-by: Yuxuan Shui --- src/backend/gl/gl_common.c | 38 ++++++++++++++++++++++++++++---------- src/backend/gl/gl_common.h | 2 +- src/backend/gl/glx.c | 2 +- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/backend/gl/gl_common.c b/src/backend/gl/gl_common.c index 623e9a66..fceb39fe 100644 --- a/src/backend/gl/gl_common.c +++ b/src/backend/gl/gl_common.c @@ -1159,13 +1159,27 @@ static void gl_image_apply_alpha(backend_t *base, struct gl_image *img, glDeleteFramebuffers(1, &fbo); } -void gl_present(backend_t *base) { +void gl_present(backend_t *base, const region_t *region) { auto gd = (struct gl_data *)base; - GLuint indices[] = {0, 1, 2, 2, 3, 0}; - GLint coord[] = { - 0, 0, gd->width, 0, gd->width, gd->height, 0, gd->height, - }; + int nrects; + const rect_t *rect = pixman_region32_rectangles((region_t *)region, &nrects); + auto coord = ccalloc(nrects * 8, GLint); + auto indices = ccalloc(nrects * 6, GLuint); + for (int i = 0; i < nrects; i++) { + // clang-format off + memcpy(&coord[i * 8], + (GLint[]){rect[i].x1, gd->height - rect[i].y2, + rect[i].x2, gd->height - rect[i].y2, + rect[i].x2, gd->height - rect[i].y1, + rect[i].x1, gd->height - rect[i].y1}, + sizeof(GLint) * 8); + // clang-format on + + GLuint u = (GLuint)(i * 4); + memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}, + sizeof(GLuint) * 6); + } glUseProgram(gd->present_prog); glBindTexture(GL_TEXTURE_2D, gd->back_texture); @@ -1179,18 +1193,22 @@ void gl_present(backend_t *base) { glEnableVertexAttribArray(vert_coord_loc); glBindBuffer(GL_ARRAY_BUFFER, bo[0]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bo[1]); - glBufferData(GL_ARRAY_BUFFER, (long)sizeof(coord), coord, GL_STREAM_DRAW); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, (long)sizeof(indices), indices, GL_STREAM_DRAW); + glBufferData(GL_ARRAY_BUFFER, (long)sizeof(GLint) * nrects * 8, coord, GL_STREAM_DRAW); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, (long)sizeof(GLuint) * nrects * 6, indices, + GL_STREAM_DRAW); - glVertexAttribPointer(vert_coord_loc, 2, GL_UNSIGNED_INT, GL_FALSE, - sizeof(GLuint) * 2, NULL); - glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, NULL); + glVertexAttribPointer(vert_coord_loc, 2, GL_INT, GL_FALSE, + sizeof(GLint) * 2, NULL); + glDrawElements(GL_TRIANGLES, nrects * 6, GL_UNSIGNED_INT, NULL); glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindVertexArray(0); glDeleteBuffers(2, bo); glDeleteVertexArrays(1, &vao); + + free(coord); + free(indices); } /// stub for backend_operations::image_op diff --git a/src/backend/gl/gl_common.h b/src/backend/gl/gl_common.h index 590f9121..d0644d80 100644 --- a/src/backend/gl/gl_common.h +++ b/src/backend/gl/gl_common.h @@ -113,7 +113,7 @@ void gl_get_blur_size(void *blur_context, int *width, int *height); bool gl_is_image_transparent(backend_t *base, void *image_data); void gl_fill(backend_t *base, struct color, const region_t *clip); -void gl_present(backend_t *base); +void gl_present(backend_t *base, const region_t *); static inline void gl_delete_texture(GLuint texture) { glDeleteTextures(1, &texture); diff --git a/src/backend/gl/glx.c b/src/backend/gl/glx.c index 2e8ccc5f..55181181 100644 --- a/src/backend/gl/glx.c +++ b/src/backend/gl/glx.c @@ -438,7 +438,7 @@ err: static void glx_present(backend_t *base, const region_t *region attr_unused) { struct _glx_data *gd = (void *)base; - gl_present(base); + gl_present(base, region); glXSwapBuffers(gd->display, gd->target_win); // XXX there should be no need to block compton will wait for render to finish if (!gd->gl.is_nvidia) {