diff options
author | Søren Sandmann <ssp@redhat.com> | 2012-02-07 14:36:05 -0500 |
---|---|---|
committer | Søren Sandmann <ssp@redhat.com> | 2012-02-07 14:36:05 -0500 |
commit | 1a371d76e32b2b3612e37ae15684632c987699b7 (patch) | |
tree | 16f98c462a53213279940c88d978d8222e77579b /src | |
parent | 5a6715a074abb5ab2eb0513038a1ba8bd577239e (diff) |
In qxl_check_copy() accept pixmaps that don't have surfaces
UXA will correctly fall back to using PutImage if the pixmaps are not
in offscreen memory (ie., they don't have surfaces attached), so there
is no need to return FALSE in qxl_check_copy() just because the
pixmaps don't have surfaces associated with them.
Diffstat (limited to 'src')
-rw-r--r-- | src/qxl_driver.c | 3 | ||||
-rw-r--r-- | src/qxl_surface.c | 14 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c index bf9eec3..191fa07 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -806,9 +806,6 @@ qxl_check_copy (PixmapPtr source, PixmapPtr dest, return FALSE; } - if (!get_surface (source) || !get_surface (dest)) - return FALSE; - return TRUE; } diff --git a/src/qxl_surface.c b/src/qxl_surface.c index 2779cc9..c2c5bdb 100644 --- a/src/qxl_surface.c +++ b/src/qxl_surface.c @@ -1321,23 +1321,9 @@ qxl_surface_prepare_copy (qxl_surface_t *dest, if (!REGION_NIL (&(dest->access_region)) || !REGION_NIL (&(source->access_region))) { -#if 0 - ErrorF (" copy not in vmvm\n"); -#endif - return FALSE; } -#if 0 - if (dest->id != source->id) - return FALSE; -#endif - -#ifdef DEBUG_REGIONS - print_region ("prepare copy src", &(source->access_region)); - print_region ("prepare copy dest", &(dest->access_region)); -#endif - dest->u.copy_src = source; return TRUE; |