diff options
| -rw-r--r-- | render/fx_renderer/fx_renderer.c | 6 | ||||
| -rw-r--r-- | types/scene/wlr_scene.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/render/fx_renderer/fx_renderer.c b/render/fx_renderer/fx_renderer.c index ce80917..d2d01db 100644 --- a/render/fx_renderer/fx_renderer.c +++ b/render/fx_renderer/fx_renderer.c @@ -833,7 +833,11 @@ struct wlr_renderer *fx_renderer_create_egl(struct wlr_egl *egl) { load_gl_proc(&renderer->procs.glQueryCounterEXT, "glQueryCounterEXT"); load_gl_proc(&renderer->procs.glGetQueryObjectivEXT, "glGetQueryObjectivEXT"); load_gl_proc(&renderer->procs.glGetQueryObjectui64vEXT, "glGetQueryObjectui64vEXT"); - load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64vEXT"); + if (eglGetProcAddress("glGetInteger64vEXT")) { + load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64vEXT"); + } else { + load_gl_proc(&renderer->procs.glGetInteger64vEXT, "glGetInteger64v"); + } } if (renderer->exts.KHR_debug) { diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c index 2f887e1..753803e 100644 --- a/types/scene/wlr_scene.c +++ b/types/scene/wlr_scene.c @@ -1432,6 +1432,11 @@ static void scene_output_handle_commit(struct wl_listener *listener, void *data) WLR_OUTPUT_STATE_ENABLED)) { scene_output_update_geometry(scene_output, force_update); } + + if (scene_output->scene->debug_damage_option == WLR_SCENE_DEBUG_DAMAGE_HIGHLIGHT && + !wl_list_empty(&scene_output->damage_highlight_regions)) { + wlr_output_schedule_frame(scene_output->output); + } } static void scene_output_handle_damage(struct wl_listener *listener, void *data) { @@ -2046,11 +2051,6 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output, wlr_buffer_unlock(buffer); output_state_apply_damage(&render_data, state); - if (debug_damage == WLR_SCENE_DEBUG_DAMAGE_HIGHLIGHT && - !wl_list_empty(&scene_output->damage_highlight_regions)) { - wlr_output_schedule_frame(scene_output->output); - } - return true; } |