diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-01 17:17:49 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-01 17:30:38 +0100 |
| commit | b83e2a79f2a082630e0d3147abec8d3599f3f4b4 (patch) | |
| tree | 88d34fdf731d43acb1211c5044a4c685f0050817 | |
| parent | 67e8ac365c4b7dd9c4eb2abe46aecc8cc04d4278 (diff) | |
uxa: Static analysis warning fixes
A smattering of bugs and confusing code.
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/i915_render.c | 2 | ||||
| -rw-r--r-- | src/intel_dri.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index 5605edff..0ad991a7 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -665,7 +665,7 @@ i915_prepare_composite(int op, PicturePtr source_picture, drm_intel_bo *bo_table[] = { NULL, /* batch_bo */ intel_get_pixmap_bo(dest), - source ? intel_get_pixmap_bo(source) : NULL, + intel_get_pixmap_bo(source), mask ? intel_get_pixmap_bo(mask) : NULL, }; int tex_unit = 0; diff --git a/src/intel_dri.c b/src/intel_dri.c index 3261e546..2a95edb8 100644 --- a/src/intel_dri.c +++ b/src/intel_dri.c @@ -1034,9 +1034,6 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back) struct intel_pixmap *front_intel = intel_get_pixmap_private(front_pixmap); struct intel_pixmap *back_intel = intel_get_pixmap_private(back_pixmap); - if (drawable == NULL) - return FALSE; - if (!DRI2CanFlip(drawable)) return FALSE; @@ -1275,7 +1272,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front, swap_info->event_data = data; swap_info->front = front; swap_info->back = back; - swap_info->pipe = I830DRI2DrawablePipe(draw); + swap_info->pipe = pipe; if (!i830_dri2_add_frame_event(swap_info)) { free(swap_info); |