Add post_frame event to wlr_output, use wlr_drm_plane_make_current in wlr_drm_output_read_pixels

1 files changed, 4 insertions, 3 deletions

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 117e5749..ec0c29f7 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -636,9 +636,9 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
 
 static void wlr_drm_connector_read_pixels(struct wlr_output *_output,
 		void *out_data) {
-	struct wlr_drm_output *output = (struct wlr_drm_output *)_output;
-	struct wlr_drm_crtc *crtc = output->crtc;
-	struct wlr_drm_plane *plane = crtc->primary;
+	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
+	struct wlr_drm_plane *plane = conn->crtc->primary;
+	wlr_drm_plane_make_current(conn->renderer, plane);
 	glReadPixels(0, 0, plane->width, plane->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
 		out_data);
 }
@@ -846,6 +846,7 @@ static void page_flip_handler(int fd, unsigned seq,
 
 	if (drm->session->active) {
 		wl_signal_emit(&conn->output.events.frame, &conn->output);
+		wl_signal_emit(&conn->output.events.post_frame, &conn->output);
 	}
 }