mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'gles2-tbr-scissor-master' into 'master'

Browse source 
render/gles2: add scissor-based clipping for tile-based renderers

See merge request wlroots/wlroots!5295
This commit is contained in:
José María Casanova Crespo 2026-04-07 12:07:14 +02:00
commit 615cf1a235
3 changed files with 59 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/render/gles2.h
View file

@ -87,6 +87,8 @@ struct wlr_gles2_renderer {
struct wl_list buffers; // wlr_gles2_buffer.link struct wl_list buffers; // wlr_gles2_buffer.link
struct wl_list textures; // wlr_gles2_texture.link struct wl_list textures; // wlr_gles2_texture.link
bool scissor; // enables scissor clipping for tile render GPUs
}; };
struct wlr_gles2_render_timer { struct wlr_gles2_render_timer {

78
render/gles2/pass.c
View file

@ -75,7 +75,7 @@ out:
return ok; return ok;
} }
static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLint attrib) { static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLint attrib, bool scissor) {
pixman_region32_t region; pixman_region32_t region;
pixman_region32_init_rect(&region, box->x, box->y, box->width, box->height); pixman_region32_init_rect(&region, box->x, box->y, box->width, box->height);
@ -92,31 +92,55 @@ static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLi
glEnableVertexAttribArray(attrib); glEnableVertexAttribArray(attrib);
for (int i = 0; i < rects_len;) { if (scissor) {
int batch = rects_len - i < MAX_QUADS ? rects_len - i : MAX_QUADS; GLfloat verts[12];
int batch_end = batch + i;
size_t vert_index = 0;
GLfloat verts[MAX_QUADS * 6 * 2];
for (; i < batch_end; i++) {
const pixman_box32_t *rect = &rects[i];
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
}
glVertexAttribPointer(attrib, 2, GL_FLOAT, GL_FALSE, 0, verts); glVertexAttribPointer(attrib, 2, GL_FLOAT, GL_FALSE, 0, verts);
glDrawArrays(GL_TRIANGLES, 0, batch * 6); glEnable(GL_SCISSOR_TEST);
for (int i = 0; i < rects_len; i++) {
const pixman_box32_t *rect = &rects[i];
verts[0] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[1] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[2] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[3] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[4] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[5] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[6] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[7] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[8] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[9] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[10] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[11] = (GLfloat)(rect->y2 - box->y) / box->height;
glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1);
glDrawArrays(GL_TRIANGLES, 0, 6);
}
glDisable(GL_SCISSOR_TEST);
} else {
for (int i = 0; i < rects_len;) {
int batch = rects_len - i < MAX_QUADS ? rects_len - i : MAX_QUADS;
int batch_end = batch + i;
size_t vert_index = 0;
GLfloat verts[MAX_QUADS * 6 * 2];
for (; i < batch_end; i++) {
const pixman_box32_t *rect = &rects[i];
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y1 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x2 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
verts[vert_index++] = (GLfloat)(rect->x1 - box->x) / box->width;
verts[vert_index++] = (GLfloat)(rect->y2 - box->y) / box->height;
}
glVertexAttribPointer(attrib, 2, GL_FLOAT, GL_FALSE, 0, verts);
glDrawArrays(GL_TRIANGLES, 0, batch * 6);
}
} }
glDisableVertexAttribArray(attrib); glDisableVertexAttribArray(attrib);
@ -247,7 +271,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box); set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box);
set_tex_matrix(shader->tex_proj, options->transform, &src_fbox); set_tex_matrix(shader->tex_proj, options->transform, &src_fbox);
render(&dst_box, options->clip, shader->pos_attrib); render(&dst_box, options->clip, shader->pos_attrib, renderer->scissor);
glBindTexture(texture->target, 0); glBindTexture(texture->target, 0);
pop_gles2_debug(renderer); pop_gles2_debug(renderer);
@ -278,7 +302,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
glUseProgram(renderer->shaders.quad.program); glUseProgram(renderer->shaders.quad.program);
set_proj_matrix(renderer->shaders.quad.proj, pass->projection_matrix, &box); set_proj_matrix(renderer->shaders.quad.proj, pass->projection_matrix, &box);
glUniform4f(renderer->shaders.quad.color, color->r, color->g, color->b, color->a); glUniform4f(renderer->shaders.quad.color, color->r, color->g, color->b, color->a);
render(&box, options->clip, renderer->shaders.quad.pos_attrib); render(&box, options->clip, renderer->shaders.quad.pos_attrib, renderer->scissor);
} }
pop_gles2_debug(renderer); pop_gles2_debug(renderer);

6
render/gles2/renderer.c
View file

@ -18,6 +18,7 @@
#include "render/egl.h" #include "render/egl.h"
#include "render/gles2.h" #include "render/gles2.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "util/env.h"
#include "util/time.h" #include "util/time.h"
#include "common_vert_src.h" #include "common_vert_src.h"
@ -541,6 +542,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
wlr_log(WLR_INFO, "GL renderer: %s", glGetString(GL_RENDERER)); wlr_log(WLR_INFO, "GL renderer: %s", glGetString(GL_RENDERER));
wlr_log(WLR_INFO, "Supported GLES2 extensions: %s", exts_str); wlr_log(WLR_INFO, "Supported GLES2 extensions: %s", exts_str);
renderer->scissor = env_parse_bool("WLR_GLES2_SCISSOR_CLIP");
if (renderer->scissor) {
wlr_log(WLR_INFO, "Enabled scissoring clipping");
}
if (!renderer->egl->exts.EXT_image_dma_buf_import) { if (!renderer->egl->exts.EXT_image_dma_buf_import) {
wlr_log(WLR_ERROR, "EGL_EXT_image_dma_buf_import not supported"); wlr_log(WLR_ERROR, "EGL_EXT_image_dma_buf_import not supported");
free(renderer); free(renderer);