From 4072809149a9a624d1d2cbff377a5c88b985abac Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 5 Jun 2024 18:33:59 +0100 Subject: [PATCH] dri: Delete createImageFromName Its last user is now gone. Bye! Signed-off-by: Daniel Stone Part-of: --- src/gallium/frontends/dri/dri2.c | 36 ---------------------------- src/gallium/include/mesa_interface.h | 10 ++------ 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 9232e8f37c1..23d2ebf9586 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -1116,39 +1116,6 @@ dri2_create_image_from_winsys(__DRIscreen *_screen, return img; } -static __DRIimage * -dri2_create_image_from_name(__DRIscreen *_screen, - int width, int height, int format, - int name, int pitch, void *loaderPrivate) -{ - const struct dri2_format_mapping *map = dri2_get_mapping_by_format(format); - struct winsys_handle whandle; - __DRIimage *img; - - if (!map) - return NULL; - - memset(&whandle, 0, sizeof(whandle)); - whandle.type = WINSYS_HANDLE_TYPE_SHARED; - whandle.handle = name; - whandle.format = map->pipe_format; - whandle.modifier = DRM_FORMAT_MOD_INVALID; - - whandle.stride = pitch * util_format_get_blocksize(map->pipe_format); - - img = dri2_create_image_from_winsys(_screen, width, height, map, - 1, &whandle, 0, loaderPrivate); - - if (!img) - return NULL; - - img->dri_components = map->dri_components; - img->dri_fourcc = map->dri_fourcc; - img->dri_format = map->dri_format; - - return img; -} - static unsigned dri2_get_modifier_num_planes(__DRIscreen *_screen, uint64_t modifier, int fourcc) @@ -1951,7 +1918,6 @@ dri2_get_capabilities(__DRIscreen *_screen) static const __DRIimageExtension dri2ImageExtensionTempl = { .base = { __DRI_IMAGE, 22 }, - .createImageFromName = dri2_create_image_from_name, .createImageFromRenderbuffer = dri2_create_image_from_renderbuffer, .destroyImage = dri2_destroy_image, .createImage = dri2_create_image, @@ -1977,7 +1943,6 @@ static const __DRIimageExtension dri2ImageExtensionTempl = { const __DRIimageExtension driVkImageExtension = { .base = { __DRI_IMAGE, 20 }, - .createImageFromName = dri2_create_image_from_name, .createImageFromRenderbuffer = dri2_create_image_from_renderbuffer, .destroyImage = dri2_destroy_image, .createImage = dri2_create_image, @@ -2001,7 +1966,6 @@ const __DRIimageExtension driVkImageExtension = { const __DRIimageExtension driVkImageExtensionSw = { .base = { __DRI_IMAGE, 20 }, - .createImageFromName = dri2_create_image_from_name, .createImageFromRenderbuffer = dri2_create_image_from_renderbuffer, .destroyImage = dri2_destroy_image, .createImage = dri2_create_image, diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h index 07dfa6f35cc..13ba3e4c2b0 100644 --- a/src/gallium/include/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h @@ -1427,11 +1427,6 @@ typedef struct __DRIimageExtensionRec __DRIimageExtension; struct __DRIimageExtensionRec { __DRIextension base; - __DRIimage *(*createImageFromName)(__DRIscreen *screen, - int width, int height, int format, - int name, int pitch, - void *loaderPrivate); - void (*destroyImage)(__DRIimage *image); __DRIimage *(*createImage)(__DRIscreen *screen, @@ -1454,9 +1449,8 @@ struct __DRIimageExtensionRec { unsigned char (*validateUsage)(__DRIimage *image, unsigned int use); /** - * Unlike createImageFromName __DRI_IMAGE_FORMAT is not used but instead - * DRM_FORMAT_*, and strides are in bytes not pixels. Stride is - * also per block and not per pixel (for non-RGB, see gallium blocks). + * Create an image from a series of GEM names; uses FourCC for format + * and byte stride. * * \since 5 */