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

sna: After move-to-gpu signals yes, force the GPU bo creation 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-03-12 20:25:50 +00:00
parent 2ee7de1f17
commit 7bde1f55a1
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sna/sna_render.c
View File

@ -591,22 +591,16 @@ sna_render_pixmap_bo(struct sna *sna,
if (bo) {
bo = kgem_bo_reference(bo);
} else {
if (texture_is_cpu(pixmap, &box) && !move_to_gpu(pixmap, &box)) {
if (!texture_is_cpu(pixmap, &box) || move_to_gpu(pixmap, &box)) {
priv = sna_pixmap_force_to_gpu(pixmap, MOVE_READ);
if (priv)
bo = kgem_bo_reference(priv->gpu_bo);
}
if (bo == NULL) {
DBG(("%s: uploading CPU box (%d, %d), (%d, %d)\n",
__FUNCTION__, box.x1, box.y1, box.x2, box.y2));
bo = upload(sna, channel, pixmap, &box);
}
if (bo == NULL) {
priv = sna_pixmap_move_to_gpu(pixmap, MOVE_READ);
if (priv) {
bo = kgem_bo_reference(priv->gpu_bo);
} else {
DBG(("%s: failed to upload pixmap to gpu, uploading CPU box (%d, %d), (%d, %d) instead\n",
__FUNCTION__, box.x1, box.y1, box.x2, box.y2));
bo = upload(sna, channel, pixmap, &box);
}
}
}
channel->bo = bo;
@ -1148,7 +1142,7 @@ sna_render_picture_extract(struct sna *sna,
move_to_gpu(pixmap, &box)) {
struct sna_pixmap *priv;
priv = sna_pixmap_move_to_gpu(pixmap, MOVE_READ);
priv = sna_pixmap_force_to_gpu(pixmap, MOVE_READ);
if (priv) {
src_bo = priv->gpu_bo;
upload = false;