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

compositor-drm: Put logic of destroy/releasing bo's in its own function

Browse Source 
We have this duplicated in a few places.
This commit is contained in:
Ander Conselvan de Oliveira
2013-01-25 15:13:03 +02:00
committed by Kristian Høgsberg
parent 229291789a
commit 526d46118e
1 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+22 -32
View File
@@ -287,6 +287,21 @@ drm_fb_set_buffer(struct drm_fb *fb, struct wl_buffer *buffer)
weston_buffer_reference(&fb->buffer_ref, buffer); weston_buffer_reference(&fb->buffer_ref, buffer);
} }
static void
drm_output_release_fb(struct drm_output *output, struct drm_fb *fb)
{
if (!fb)
return;
if (fb->bo) {
if (fb->is_client_buffer)
gbm_bo_destroy(fb->bo);
else
gbm_surface_release_buffer(output->surface,
output->current->bo);
}
}
static uint32_t static uint32_t
drm_output_check_scanout_format(struct drm_output *output, drm_output_check_scanout_format(struct drm_output *output,
struct weston_surface *es, struct gbm_bo *bo) struct weston_surface *es, struct gbm_bo *bo)
@@ -486,9 +501,7 @@ vblank_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec,
output->vblank_pending = 0; output->vblank_pending = 0;
if (s->current) drm_output_release_fb(output, s->current);
gbm_bo_destroy(s->current->bo);
s->current = s->next; s->current = s->next;
s->next = NULL; s->next = NULL;
@@ -507,14 +520,7 @@ page_flip_handler(int fd, unsigned int frame,
output->page_flip_pending = 0; output->page_flip_pending = 0;
if (output->current) { drm_output_release_fb(output, output->current);
if (output->current->is_client_buffer)
gbm_bo_destroy(output->current->bo);
else
gbm_surface_release_buffer(output->surface,
output->current->bo);
}
output->current = output->next; output->current = output->next;
output->next = NULL; output->next = NULL;
@@ -973,23 +979,9 @@ drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mo
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED; WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
/* reset rendering stuff. */ /* reset rendering stuff. */
if (output->current) { drm_output_release_fb(output, output->current);
if (output->current->is_client_buffer) drm_output_release_fb(output, output->next);
gbm_bo_destroy(output->current->bo); output->current = output->next = NULL;
else
gbm_surface_release_buffer(output->surface,
output->current->bo);
}
output->current = NULL;
if (output->next) {
if (output->next->is_client_buffer)
gbm_bo_destroy(output->next->bo);
else
gbm_surface_release_buffer(output->surface,
output->next->bo);
}
output->next = NULL;
gl_renderer_output_destroy(&output->base); gl_renderer_output_destroy(&output->base);
gbm_surface_destroy(output->surface); gbm_surface_destroy(output->surface);
@@ -1540,10 +1532,8 @@ destroy_sprites(struct drm_compositor *compositor)
sprite->plane_id, sprite->plane_id,
output->crtc_id, 0, 0, output->crtc_id, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0, 0, 0);
if (sprite->current) drm_output_release_fb(output, sprite->current);
gbm_bo_destroy(sprite->current->bo); drm_output_release_fb(output, sprite->next);
if (sprite->next)
gbm_bo_destroy(sprite->next->bo);
weston_plane_release(&sprite->plane); weston_plane_release(&sprite->plane);
free(sprite); free(sprite);
} }