Re: [PATCH 17/72] drm: dropped obsolete/unused intel_bo_get_image()
Bryce Harrington <[email protected]>
| Newsgroups | gmane.comp.lib.cairo |
|---|---|
| Message-ID | <[email protected]> |
On Tue, Dec 29, 2015 at 10:16:55AM +0100, Enrico Weigelt, metux IT consult wrote: > Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> LGTM, Reviewed-by: Bryce Harrington <[email protected]> > --- > src/drm/cairo-drm-intel-private.h | 5 ----- > src/drm/cairo-drm-intel.c | 44 --------------------------------------- > 2 files changed, 49 deletions(-) > > diff --git a/src/drm/cairo-drm-intel-private.h b/src/drm/cairo-drm-intel-private.h > index 343270a..f9aed37 100644 > --- a/src/drm/cairo-drm-intel-private.h > +++ b/src/drm/cairo-drm-intel-private.h > @@ -313,11 +313,6 @@ intel_bo_init_for_name (const intel_device_t *dev, > uint32_t size, > uint32_t name); > > -cairo_private cairo_surface_t * > -intel_bo_get_image (const intel_device_t *device, > - intel_bo_t *bo, > - const cairo_drm_surface_t *surface); > - > cairo_private cairo_status_t > intel_bo_put_image (intel_device_t *dev, > intel_bo_t *bo, > diff --git a/src/drm/cairo-drm-intel.c b/src/drm/cairo-drm-intel.c > index d45155e..85fbaea 100644 > --- a/src/drm/cairo-drm-intel.c > +++ b/src/drm/cairo-drm-intel.c > @@ -528,50 +528,6 @@ intel_bo_set_tiling (const intel_device_t *device, > bo->_stride = bo->stride; > } > > -cairo_surface_t * > -intel_bo_get_image (const intel_device_t *device, > - intel_bo_t *bo, > - const cairo_drm_surface_t *surface) > -{ > - cairo_image_surface_t *image; > - uint8_t *dst; > - int size, row; > - > - image = (cairo_image_surface_t *) > - cairo_image_surface_create (surface->format, > - surface->width, > - surface->height); > - if (unlikely (image->base.status)) > - return &image->base; > - > - intel_bo_set_tiling (device, bo); > - > - if (bo->tiling == I915_TILING_NONE && image->stride == surface->stride) { > - size = surface->stride * surface->height; > - intel_bo_read (device, bo, 0, size, image->data); > - } else { > - const uint8_t *src; > - > - src = intel_bo_map (device, bo); > - if (unlikely (src == NULL)) > - return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); > - > - size = surface->width; > - if (surface->format != CAIRO_FORMAT_A8) > - size *= 4; > - > - row = surface->height; > - dst = image->data; > - while (row--) { > - memcpy (dst, src, size); > - dst += image->stride; > - src += surface->stride; > - } > - } > - > - return &image->base; > -} > - > static cairo_status_t > _intel_bo_put_a1_image (intel_device_t *device, > intel_bo_t *bo, > -- > 2.6.4.442.g545299f > > -- > cairo mailing list > [email protected] > http://lists.cairographics.org/mailman/listinfo/cairo -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo