diff options
| author | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
| commit | c3b2230b71cb3a00a7f4c0987197d397bada650b (patch) | |
| tree | 018f5df0f8b5976ddb56ef4f13e9466587838998 /src/egl/wayland/wayland-drm/wayland-drm.c | |
| parent | 003401f95c9b59471c22368b7da16fe7a951e490 (diff) | |
| parent | 424b1210d951c206e7c2fb8f2778acbd384eb247 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/tests/trivial/Makefile
src/gallium/winsys/g3dvl/dri/XF86dri.c
src/gallium/winsys/g3dvl/dri/driclient.c
src/gallium/winsys/g3dvl/dri/driclient.h
src/gallium/winsys/g3dvl/dri/xf86dri.h
src/gallium/winsys/g3dvl/dri/xf86dristr.h
src/gallium/winsys/r600/drm/r600_bo.c
Diffstat (limited to 'src/egl/wayland/wayland-drm/wayland-drm.c')
| -rw-r--r-- | src/egl/wayland/wayland-drm/wayland-drm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c index 6cc442b9d53..3023cd02b07 100644 --- a/src/egl/wayland/wayland-drm/wayland-drm.c +++ b/src/egl/wayland/wayland-drm/wayland-drm.c @@ -88,17 +88,17 @@ drm_create_buffer(struct wl_client *client, struct wl_drm *drm, { struct wl_drm_buffer *buffer; - buffer = malloc(sizeof *buffer); + buffer = calloc(1, sizeof *buffer); if (buffer == NULL) { wl_client_post_no_memory(client); return; } buffer->drm = drm; - buffer->buffer.compositor = NULL; buffer->buffer.width = width; buffer->buffer.height = height; buffer->buffer.visual = visual; + buffer->buffer.client = client; if (!visual || visual->object.interface != &wl_visual_interface) { wl_client_post_error(client, &drm->object, |