Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uxa/dri: Silence static analyser for potential NULL intel_pixmap 

If the intel_pixmap was NULL we should have failed to create the DRI2
buffer, so we can safely assert here to keep the analyser quiet.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-06-06 17:10:35 +01:00
parent 06b1b875ba
commit 08010b23a3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/intel_dri.c
View File

@ -919,6 +919,13 @@ intel_glamor_create_back_pixmap(ScreenPtr screen,
return back_pixmap;
}
static drm_intel_bo *get_pixmap_bo(I830DRI2BufferPrivatePtr priv)
{
drm_intel_bo *bo = intel_get_pixmap_bo(priv->pixmap);
assert(bo != NULL); /* guaranteed by construction of the DRI2 buffer */
return bo;
}
/*
* Our internal swap routine takes care of actually exchanging, blitting, or
* flipping buffers as necessary.
@ -935,7 +942,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
if (!intel->use_triple_buffer) {
info->type = DRI2_SWAP;
if (!intel_do_pageflip(intel,
intel_get_pixmap_bo(priv->pixmap),
get_pixmap_bo(priv),
info, info->pipe))
return FALSE;
@ -990,7 +997,7 @@ I830DRI2ScheduleFlip(struct intel_screen_private *intel,
intel->back_buffer = NULL;
}
old_back = intel_get_pixmap_bo(priv->pixmap);
old_back = get_pixmap_bo(priv);
if (!intel_do_pageflip(intel, old_back, info, info->pipe)) {
intel->back_buffer = new_back;
return FALSE;