Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-01-21 22:16:55 +01:00
commit 59c53e8333
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
16 changed files with 220 additions and 92 deletions

View file

@ -64,8 +64,12 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
odata->x_offs += odata->x_vel * seconds;
odata->y_offs += odata->y_vel * seconds;
if (odata->x_offs > 128) odata->x_offs = 0;
if (odata->y_offs > 128) odata->y_offs = 0;
if (odata->x_offs > 128) {
odata->x_offs = 0;
}
if (odata->y_offs > 128) {
odata->y_offs = 0;
}
}
static void handle_output_add(struct output_state *output) {