commit 861a50c141e749e4e403eaefe56e4746b8f53801
author Kristian Høgsberg <krh@bitplanet.net> Wed Sep 05 22:02:22 2012 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Thu Sep 06 21:08:12 2012 -0400
tree e2edbcad9be98442f7bd5650a18af32e030793f5
parent ecf6edec1f63b5d3647f2f15d614232ce12c15ec

compositor: Move non-GL initialization out of weston_compositor_init_gl()

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index ac78eda..0ffaadc 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3144,6 +3144,14 @@
 
 	ec->input_loop = wl_event_loop_create();
 
+	weston_spring_init(&ec->fade.spring, 30.0, 1.0, 1.0);
+	ec->fade.animation.frame = fade_frame;
+
+	weston_layer_init(&ec->fade_layer, &ec->layer_list);
+	weston_layer_init(&ec->cursor_layer, &ec->fade_layer.link);
+
+	weston_compositor_schedule_repaint(ec);
+
 	return 0;
 }
 
@@ -3202,12 +3210,6 @@
 	if (ec->has_bind_display)
 		ec->bind_display(ec->egl_display, ec->wl_display);
 
-	weston_spring_init(&ec->fade.spring, 30.0, 1.0, 1.0);
-	ec->fade.animation.frame = fade_frame;
-
-	weston_layer_init(&ec->fade_layer, &ec->layer_list);
-	weston_layer_init(&ec->cursor_layer, &ec->fade_layer.link);
-
 	glActiveTexture(GL_TEXTURE0);
 
 	if (weston_shader_init(&ec->texture_shader_rgba,
@@ -3233,8 +3235,6 @@
 			     vertex_shader, solid_fragment_shader) < 0)
 		return -1;
 
-	weston_compositor_schedule_repaint(ec);
-
 	return 0;
 }