drisw: use getImageShm() if available

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Marc-André Lureau 2015-06-15 15:09:58 +02:00 committed by Dave Airlie
parent 9feaf33371
commit 17b27725fe

View file

@ -117,6 +117,26 @@ get_image2(__DRIdrawable *dPriv, int x, int y, int width, int height, int stride
data, dPriv->loaderPrivate);
}
static inline bool
get_image_shm(__DRIdrawable *dPriv, int x, int y, int width, int height,
struct pipe_resource *res)
{
__DRIscreen *sPriv = dPriv->driScreenPriv;
const __DRIswrastLoaderExtension *loader = sPriv->swrast_loader;
struct winsys_handle whandle;
whandle.type = WINSYS_HANDLE_TYPE_SHMID;
if (loader->base.version < 4 || !loader->getImageShm)
return FALSE;
if (!res->screen->resource_get_handle(res->screen, NULL, res, &whandle, PIPE_HANDLE_USAGE_WRITE))
return FALSE;
loader->getImageShm(dPriv, x, y, width, height, whandle.handle, dPriv->loaderPrivate);
return TRUE;
}
static void
drisw_update_drawable_info(struct dri_drawable *drawable)
{
@ -364,7 +384,8 @@ drisw_update_tex_buffer(struct dri_drawable *drawable,
x, y, w, h, &transfer);
/* Copy the Drawable content to the mapped texture buffer */
get_image(dPriv, x, y, w, h, map);
if (!get_image_shm(dPriv, x, y, w, h, res))
get_image(dPriv, x, y, w, h, map);
/* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
get_image() has a pitch rounded up to 4 bytes. */