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

compositor: Use weston_surface_create for creating solid color fade surface

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-01-26 10:03:45 -05:00
parent bbeefb0189
commit 607c1a769d
1 changed files with 13 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+13 -47
View File
@@ -579,7 +579,7 @@ weston_surface_draw(struct weston_surface *es, struct weston_output *output)
ec->current_shader = es->shader; ec->current_shader = es->shader;
} }
if (es->alpha != ec->current_alpha) { if (es->shader->alpha_uniform && es->alpha != ec->current_alpha) {
glUniform1f(es->shader->alpha_uniform, es->alpha / 255.0); glUniform1f(es->shader->alpha_uniform, es->alpha / 255.0);
ec->current_alpha = es->alpha; ec->current_alpha = es->alpha;
} }
@@ -694,47 +694,6 @@ fade_frame(struct weston_animation *animation,
weston_output_damage(output); weston_output_damage(output);
} }
static void
solid_surface_init(struct weston_surface *surface,
struct weston_output *output, GLfloat tint)
{
struct weston_compositor *compositor = output->compositor;
surface->compositor = compositor;
surface->x = output->x;
surface->y = output->y;
surface->pitch = output->current->width;
surface->width = output->current->width;
surface->height = output->current->height;
surface->texture = GL_NONE;
surface->transform = NULL;
surface->alpha = compositor->current_alpha;
surface->shader = &compositor->solid_shader;
surface->color[0] = 0.0;
surface->color[1] = 0.0;
surface->color[2] = 0.0;
surface->color[3] = tint;
pixman_region32_init(&surface->damage);
pixman_region32_copy(&surface->damage, &output->region);
pixman_region32_init(&surface->opaque);
if (tint <= 1.0) {
surface->visual = WESTON_ARGB_VISUAL;
} else {
surface->visual = WESTON_RGB_VISUAL;
pixman_region32_copy(&surface->opaque, &output->region);
}
wl_list_insert(&compositor->surface_list, &surface->link);
}
static void
solid_surface_release(struct weston_surface *surface)
{
wl_list_remove(&surface->link);
pixman_region32_fini(&surface->damage);
}
static void static void
weston_output_set_cursor(struct weston_output *output, weston_output_set_cursor(struct weston_output *output,
struct wl_input_device *dev) struct wl_input_device *dev)
@@ -788,7 +747,7 @@ static void
weston_output_repaint(struct weston_output *output, int msecs) weston_output_repaint(struct weston_output *output, int msecs)
{ {
struct weston_compositor *ec = output->compositor; struct weston_compositor *ec = output->compositor;
struct weston_surface *es, solid; struct weston_surface *es, *solid = NULL;
struct weston_animation *animation, *next; struct weston_animation *animation, *next;
struct weston_frame_callback *cb, *cnext; struct weston_frame_callback *cb, *cnext;
pixman_region32_t opaque, new_damage, total_damage, pixman_region32_t opaque, new_damage, total_damage,
@@ -796,8 +755,15 @@ weston_output_repaint(struct weston_output *output, int msecs)
glViewport(0, 0, output->current->width, output->current->height); glViewport(0, 0, output->current->width, output->current->height);
if (ec->fade.spring.current >= 0.001) if (ec->fade.spring.current >= 0.001) {
solid_surface_init(&solid, output, ec->fade.spring.current); solid = weston_surface_create(ec,
output->x, output->y,
output->current->width,
output->current->height);
weston_surface_set_color(solid, 0.0, 0.0, 0.0,
ec->fade.spring.current);
wl_list_insert(&ec->surface_list, &solid->link);
}
pixman_region32_init(&new_damage); pixman_region32_init(&new_damage);
pixman_region32_init(&opaque); pixman_region32_init(&opaque);
@@ -840,8 +806,8 @@ weston_output_repaint(struct weston_output *output, int msecs)
output->repaint(output); output->repaint(output);
if (ec->fade.spring.current > 0.001) if (solid)
solid_surface_release(&solid); destroy_surface(&solid->surface.resource);
pixman_region32_fini(&total_damage); pixman_region32_fini(&total_damage);