132,8 → 132,6 |
int sna_blit_tex(bitmap_t *bitmap, bool scale, int dst_x, int dst_y, |
int w, int h, int src_x, int src_y) |
{ |
// DBG("%s\n", __FUNCTION__); |
|
struct _Pixmap pixSrc, pixMask; |
struct intel_pixmap privSrc; |
struct _Picture pictSrc, pictDst; |
176,18 → 174,25 |
|
uxa_update_fb(intel); |
|
// pixDst.drawable.bitsPerPixel = 32; |
// pixDst.drawable.width = sna_fb.width; |
// pixDst.drawable.height = sna_fb.height; |
|
// pixMask.drawable.bitsPerPixel = 8; |
// pixMask.drawable.width = update.width; |
// pixMask.drawable.height = update.height; |
|
i965_prepare_composite(PictOpSrc, &pictSrc, NULL, &pictDst, |
&pixSrc, NULL, &fb_pixmap); |
|
|
i965_composite(&fb_pixmap, src_x, src_y, 0, 0, |
dst_x+winx, dst_y+winy, w, h); |
dst_x, dst_y, w, h); |
|
i830_done_composite(&fb_pixmap); |
|
intel_batch_submit(); |
|
// DBG("%s done\n", __FUNCTION__); |
|
return 0; |
}; |
|
233,15 → 238,11 |
size_t size; |
int ret; |
|
// DBG("%s\n", __FUNCTION__); |
|
ret = drmIoctl(intel->scrn, SRV_FBINFO, &fb); |
if( ret != 0 ) |
return ret; |
|
ipix = (struct intel_pixmap*)fb_pixmap.private; |
|
list_init(&ipix->batch); |
ipix->stride = fb.pitch; |
ipix->tiling = fb.tiling; |
|
299,14 → 300,6 |
goto err1; |
}; |
|
list_init(&intel->batch_pixmaps); |
|
if ((INTEL_INFO(intel)->gen == 060)) { |
intel->wa_scratch_bo = |
drm_intel_bo_alloc(intel->bufmgr, "wa scratch", |
4096, 4096); |
} |
|
if( uxa_init_fb(intel) != 0) |
goto err1; |
|