Join process_frame() and update_vnc()

shader-damage-experiments
Andri Yngvason 2020-03-28 14:09:29 +00:00
parent bfbc81bf04
commit b6ca7aff8c
1 changed files with 10 additions and 19 deletions

View File

@ -465,10 +465,17 @@ static void on_damage_check_done(struct pixman_region16* damage, void* userdata)
}
}
void wayvnc_update_vnc(struct wayvnc* self, struct nvnc_fb* fb)
void wayvnc_process_frame(struct wayvnc* self)
{
uint32_t width = nvnc_fb_get_width(fb);
uint32_t height = nvnc_fb_get_height(fb);
uint32_t format = fourcc_from_gl_format(self->renderer.read_format);
uint32_t width = output_get_transformed_width(self->selected_output);
uint32_t height = output_get_transformed_height(self->selected_output);
struct nvnc_fb* fb = nvnc_fb_new(width, height, format);
void* addr = nvnc_fb_get_addr(fb);
frame_capture_render(self->capture_backend, &self->renderer, fb);
renderer_read_frame(&self->renderer, addr, 0, height);
if (self->last_fb)
nvnc_fb_unref(self->last_fb);
@ -514,22 +521,6 @@ void wayvnc_update_vnc(struct wayvnc* self, struct nvnc_fb* fb)
}
}
void wayvnc_process_frame(struct wayvnc* self)
{
uint32_t format = fourcc_from_gl_format(self->renderer.read_format);
uint32_t fb_width = output_get_transformed_width(self->selected_output);
uint32_t fb_height =
output_get_transformed_height(self->selected_output);
struct nvnc_fb* fb = nvnc_fb_new(fb_width, fb_height, format);
void* addr = nvnc_fb_get_addr(fb);
frame_capture_render(self->capture_backend, &self->renderer, fb);
renderer_read_frame(&self->renderer, addr, 0, fb_height);
wayvnc_update_vnc(self, fb);
}
void on_capture_done(struct frame_capture* capture)
{
struct wayvnc* self = capture->userdata;