summaryrefslogtreecommitdiff
path: root/src/sna/sna_video_textured.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-01-27 18:24:01 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2012-01-27 18:25:01 +0000
commitb9c83e0b2c42f7657b1854a7cdcbc0407957c382 (patch)
tree81bbeedafde39cbb4a90b82113a5f258ba91a2d5 /src/sna/sna_video_textured.c
parent45d831c8b11d6f9f38c0cb9b5877541a971f2c67 (diff)
sna/video: Add some DBG messages to track the error paths
References: https://bugs.freedesktop.org/show_bug.cgi?id=45279 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video_textured.c')
-rw-r--r--src/sna/sna_video_textured.c27
1 files changed, 19 insertions, 8 deletions
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 09f1551b..6f691351 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -235,11 +235,16 @@ sna_video_textured_put_image(ScrnInfoPtr scrn,
drw_x, drw_y, drw_w, drw_h,
id, width, height, sync));
- if (buf == 0)
+ if (buf == 0) {
+ DBG(("%s: garbage video buffer\n", __FUNCTION__));
return BadAlloc;
+ }
- if (!sna_pixmap_is_gpu(pixmap))
+ if (!sna_pixmap_is_gpu(pixmap)) {
+ DBG(("%s: attempting to render to a non-GPU pixmap\n",
+ __FUNCTION__));
return BadAlloc;
+ }
sna_video_frame_init(sna, video, id, width, height, &frame);
@@ -261,16 +266,21 @@ sna_video_textured_put_image(ScrnInfoPtr scrn,
}
frame.bo = kgem_create_for_name(&sna->kgem, *(uint32_t*)buf);
- if (frame.bo == NULL)
+ if (frame.bo == NULL) {
+ DBG(("%s: failed to open bo\n", __FUNCTION__));
return BadAlloc;
+ }
assert(frame.bo->size >= frame.size);
} else {
frame.bo = kgem_create_linear(&sna->kgem, frame.size);
- if (frame.bo == NULL)
+ if (frame.bo == NULL) {
+ DBG(("%s: failed to allocate bo\n", __FUNCTION__));
return BadAlloc;
+ }
if (!sna_video_copy_data(sna, video, &frame, buf)) {
+ DBG(("%s: failed to copy frame\n", __FUNCTION__));
kgem_bo_destroy(&sna->kgem, frame.bo);
return BadAlloc;
}
@@ -281,13 +291,14 @@ sna_video_textured_put_image(ScrnInfoPtr scrn,
&clip->extents);
ret = Success;
- if (sna->render.video(sna, video, &frame, clip,
+ if (!sna->render.video(sna, video, &frame, clip,
src_w, src_h,
drw_w, drw_h,
- pixmap))
- DamageDamageRegion(drawable, clip);
- else
+ pixmap)) {
+ DBG(("%s: failed to render video\n", __FUNCTION__));
ret = BadAlloc;
+ } else
+ DamageDamageRegion(drawable, clip);
kgem_bo_destroy(&sna->kgem, frame.bo);