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

compositor: Decrement buffers busy_count in post_release

Browse Source
This commit is contained in:
Benjamin Franzke
2011-06-21 19:34:19 +02:00
parent ec138901c1
commit 6f5fc69b67
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+6 -14
View File
@@ -26,6 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include <limits.h> #include <limits.h>
#include <stdarg.h> #include <stdarg.h>
#include <assert.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
@@ -619,12 +620,10 @@ wlsc_compositor_damage_all(struct wlsc_compositor *compositor)
static inline void static inline void
wlsc_buffer_post_release(struct wl_buffer *buffer) wlsc_buffer_post_release(struct wl_buffer *buffer)
{ {
if (buffer->client == NULL) { if (buffer == NULL || --buffer->busy_count > 0)
fprintf(stderr, "buffer.release warning: buffer.client: %p\n",
buffer->client);
return; return;
}
assert(buffer->client != NULL);
wl_client_post_event(buffer->client, wl_client_post_event(buffer->client,
&buffer->resource.object, &buffer->resource.object,
WL_BUFFER_RELEASE); WL_BUFFER_RELEASE);
@@ -636,12 +635,8 @@ wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
struct wlsc_compositor *compositor = output->compositor; struct wlsc_compositor *compositor = output->compositor;
struct wlsc_animation *animation, *next; struct wlsc_animation *animation, *next;
if (output->scanout_buffer) { wlsc_buffer_post_release(output->scanout_buffer);
if (--output->scanout_buffer->busy_count == 0) output->scanout_buffer = NULL;
wlsc_buffer_post_release(output->scanout_buffer);
output->scanout_buffer = NULL;
}
output->finished = 1; output->finished = 1;
@@ -942,10 +937,7 @@ surface_attach(struct wl_client *client,
struct wlsc_surface *es = (struct wlsc_surface *) surface; struct wlsc_surface *es = (struct wlsc_surface *) surface;
buffer->busy_count++; buffer->busy_count++;
wlsc_buffer_post_release(es->buffer);
if (es->buffer && es->buffer->busy_count > 0)
if (--es->buffer->busy_count == 0)
wlsc_buffer_post_release(es->buffer);
es->buffer = buffer; es->buffer = buffer;
wl_list_remove(&es->buffer_destroy_listener.link); wl_list_remove(&es->buffer_destroy_listener.link);