From 1205f03ec91caef59e9eb4f1198140c8a175ee02 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 10 Jul 2023 16:00:01 +0200 Subject: [PATCH] render/gles2: wrap timer setup in push_gles2_debug() With this, errors should be properly wrapped in the debug scope. --- render/gles2/pass.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/render/gles2/pass.c b/render/gles2/pass.c index 9003f08c..9bf1747a 100644 --- a/render/gles2/pass.c +++ b/render/gles2/pass.c @@ -22,6 +22,8 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) { struct wlr_gles2_renderer *renderer = pass->buffer->renderer; struct wlr_gles2_render_timer *timer = pass->timer; + push_gles2_debug(renderer); + if (timer) { // clear disjoint flag GLint64 disjoint; @@ -33,10 +35,12 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) { // get end-of-CPU-work time in CPU time domain clock_gettime(CLOCK_MONOTONIC, &timer->cpu_end); } - push_gles2_debug(renderer); + glFlush(); glBindFramebuffer(GL_FRAMEBUFFER, 0); + pop_gles2_debug(renderer); + wlr_buffer_unlock(pass->buffer->buffer); free(pass);