i830 render: check aperture space requirements

No point not doing this.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2010-04-13 08:39:43 +02:00
parent 804263c10d
commit 324a2810da
1 changed files with 9 additions and 0 deletions

View File

@ -438,6 +438,12 @@ i830_prepare_composite(int op, PicturePtr source_picture,
{
ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
i830_get_pixmap_bo(source),
mask ? i830_get_pixmap_bo(mask) : NULL,
i830_get_pixmap_bo(dest),
};
intel->render_source_picture = source_picture;
intel->render_source = source;
@ -458,6 +464,9 @@ i830_prepare_composite(int op, PicturePtr source_picture,
if (!i830_get_dest_format(dest_picture, &intel->render_dest_format))
return FALSE;
if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
if (mask) {
intel->transform[1] = NULL;
intel->scale_units[1][0] = -1;