Merge remote-tracking branch 'bnf/fixes'

dev
Kristian Høgsberg 14 years ago
commit 8d85e886fc
  1. 1
      clients/simple-client.c
  2. 8
      compositor/compositor.c

@ -96,6 +96,7 @@ init_egl(struct display *display)
EGL_RED_SIZE, 1, EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1, EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1, EGL_BLUE_SIZE, 1,
EGL_ALPHA_SIZE, 1,
EGL_DEPTH_SIZE, 1, EGL_DEPTH_SIZE, 1,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE EGL_NONE

@ -1327,9 +1327,11 @@ wlsc_output_move(struct wlsc_output *output, int x, int y)
output->x = x; output->x = x;
output->y = y; output->y = y;
output->background->x = x; if (output->background) {
output->background->y = y; output->background->x = x;
wlsc_surface_update_matrix(output->background); output->background->y = y;
wlsc_surface_update_matrix(output->background);
}
pixman_region32_init(&output->previous_damage_region); pixman_region32_init(&output->previous_damage_region);

Loading…
Cancel
Save