diff options
| -rw-r--r-- | src/sna/sna.h | 7 | ||||
| -rw-r--r-- | src/sna/sna_video_textured.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/sna/sna.h b/src/sna/sna.h index bc149677..5910daf2 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -476,13 +476,6 @@ sna_drawable_move_to_gpu(DrawablePtr drawable, unsigned flags) return sna_pixmap_move_to_gpu(get_drawable_pixmap(drawable), flags) != NULL; } -static inline Bool -sna_pixmap_is_gpu(PixmapPtr pixmap) -{ - struct sna_pixmap *priv = pixmap ? sna_pixmap(pixmap) : NULL; - return priv && priv->gpu_bo; -} - static inline struct kgem_bo *sna_pixmap_get_bo(PixmapPtr pixmap) { return sna_pixmap(pixmap)->gpu_bo; diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index 6f691351..d99f8847 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -240,7 +240,7 @@ sna_video_textured_put_image(ScrnInfoPtr scrn, return BadAlloc; } - if (!sna_pixmap_is_gpu(pixmap)) { + if (!sna_pixmap_force_to_gpu(pixmap, MOVE_READ | MOVE_WRITE)) { DBG(("%s: attempting to render to a non-GPU pixmap\n", __FUNCTION__)); return BadAlloc; |