Merge remote-tracking branch 'bnf/fixes'

This commit is contained in:
Kristian Høgsberg
2011-03-18 00:15:25 -04:00
2 changed files with 6 additions and 3 deletions
+1
View File
@@ -96,6 +96,7 @@ init_egl(struct display *display)
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
EGL_BLUE_SIZE, 1,
EGL_ALPHA_SIZE, 1,
EGL_DEPTH_SIZE, 1,
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
EGL_NONE
+5 -3
View File
@@ -1327,9 +1327,11 @@ wlsc_output_move(struct wlsc_output *output, int x, int y)
output->x = x;
output->y = y;
output->background->x = x;
output->background->y = y;
wlsc_surface_update_matrix(output->background);
if (output->background) {
output->background->x = x;
output->background->y = y;
wlsc_surface_update_matrix(output->background);
}
pixman_region32_init(&output->previous_damage_region);