mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple-damage: Add --use-damage-buffer flag

Browse Source 
Add a new flag for testing damage in buffer co-ordinates

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
dev
Derek Foreman 9 years ago
parent 152254be0d
commit fb1e1268d5
1 changed files with 47 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      clients/simple-damage.c

62
clients/simple-damage.c
Unescape View File

@ -64,6 +64,7 @@ struct buffer {
enum window_flags { enum window_flags {
WINDOW_FLAG_USE_VIEWPORT = 0x1, WINDOW_FLAG_USE_VIEWPORT = 0x1,
WINDOW_FLAG_ROTATING_TRANSFORM = 0x2, WINDOW_FLAG_ROTATING_TRANSFORM = 0x2,
WINDOW_FLAG_USE_DAMAGE_BUFFER = 0x4,
}; };
struct window { struct window {
@ -261,6 +262,14 @@ create_window(struct display *display, int width, int height,
exit(1); exit(1);
} }
if (display->compositor_version < 4 &&
(flags & WINDOW_FLAG_USE_DAMAGE_BUFFER)) {
fprintf(stderr, "wl_surface.damage_buffer unsupported in "
"wl_surface version %d\n",
display->compositor_version);
exit(1);
}
window = calloc(1, sizeof *window); window = calloc(1, sizeof *window);
if (!window) if (!window)
return NULL; return NULL;
@ -303,8 +312,12 @@ create_window(struct display *display, int width, int height,
} }
/* Initialise damage to full surface, so the padding gets painted */ /* Initialise damage to full surface, so the padding gets painted */
wl_surface_damage(window->surface, 0, 0, INT32_MAX, INT32_MAX); if (window->flags & WINDOW_FLAG_USE_DAMAGE_BUFFER) {
wl_surface_damage_buffer(window->surface, 0, 0,
INT32_MAX, INT32_MAX);
} else {
wl_surface_damage(window->surface, 0, 0, INT32_MAX, INT32_MAX);
}
return window; return window;
} }
@ -567,12 +580,20 @@ redraw(void *data, struct wl_callback *callback, uint32_t time)
bwidth - 2 * bborder, bheight - 2 * bborder, 0x80000000); bwidth - 2 * bborder, bheight - 2 * bborder, 0x80000000);
/* Damage where the ball was */ /* Damage where the ball was */
wl_surface_damage(window->surface, if (window->flags & WINDOW_FLAG_USE_DAMAGE_BUFFER) {
window->ball.x - window->ball.radius, window_get_transformed_ball(window, &bx, &by);
window->ball.y - window->ball.radius, wl_surface_damage_buffer(window->surface,
window->ball.radius * 2 + 1, bx - bradius + off_x,
window->ball.radius * 2 + 1); by - bradius + off_y,
bradius * 2 + 1,
bradius * 2 + 1);
} else {
wl_surface_damage(window->surface,
window->ball.x - window->ball.radius,
window->ball.y - window->ball.radius,
window->ball.radius * 2 + 1,
window->ball.radius * 2 + 1);
}
window_advance_game(window, time); window_advance_game(window, time);
window_get_transformed_ball(window, &bx, &by); window_get_transformed_ball(window, &bx, &by);
@ -595,12 +616,19 @@ redraw(void *data, struct wl_callback *callback, uint32_t time)
} }
/* Damage where the ball is now */ /* Damage where the ball is now */
wl_surface_damage(window->surface, if (window->flags & WINDOW_FLAG_USE_DAMAGE_BUFFER) {
window->ball.x - window->ball.radius, wl_surface_damage_buffer(window->surface,
window->ball.y - window->ball.radius, bx - bradius + off_x,
window->ball.radius * 2 + 1, by - bradius + off_y,
window->ball.radius * 2 + 1); bradius * 2 + 1,
bradius * 2 + 1);
} else {
wl_surface_damage(window->surface,
window->ball.x - window->ball.radius,
window->ball.y - window->ball.radius,
window->ball.radius * 2 + 1,
window->ball.radius * 2 + 1);
}
wl_surface_attach(window->surface, buffer->buffer, 0, 0); wl_surface_attach(window->surface, buffer->buffer, 0, 0);
if (window->display->compositor_version >= 2 && if (window->display->compositor_version >= 2 &&
@ -787,6 +815,7 @@ print_usage(int retval)
" --transform=TRANSFORM\tTransform for the surface\n" " --transform=TRANSFORM\tTransform for the surface\n"
" --rotating-transform\tUse a different buffer_transform for each frame\n" " --rotating-transform\tUse a different buffer_transform for each frame\n"
" --use-viewport\tUse wl_viewport\n" " --use-viewport\tUse wl_viewport\n"
" --use-damage-buffer\tUse damage_buffer to post damage\n"
); );
exit(retval); exit(retval);
@ -837,7 +866,7 @@ main(int argc, char **argv)
strcmp(argv[i], "-h") == 0) { strcmp(argv[i], "-h") == 0) {
print_usage(0); print_usage(0);
} else if (sscanf(argv[i], "--version=%d", &version) > 0) { } else if (sscanf(argv[i], "--version=%d", &version) > 0) {
if (version < 1 || version > 3) { if (version < 1 || version > 4) {
fprintf(stderr, "Unsupported wl_surface version: %d\n", fprintf(stderr, "Unsupported wl_surface version: %d\n",
version); version);
return 1; return 1;
@ -861,6 +890,9 @@ main(int argc, char **argv)
} else if (strcmp(argv[i], "--use-viewport") == 0) { } else if (strcmp(argv[i], "--use-viewport") == 0) {
flags |= WINDOW_FLAG_USE_VIEWPORT; flags |= WINDOW_FLAG_USE_VIEWPORT;
continue; continue;
} else if (strcmp(argv[i], "--use-damage-buffer") == 0) {
flags |= WINDOW_FLAG_USE_DAMAGE_BUFFER;
continue;
} else { } else {
printf("Invalid option: %s\n", argv[i]); printf("Invalid option: %s\n", argv[i]);
print_usage(255); print_usage(255);

Write Preview
Loading…
Cancel
Save