From b1bcda45be45bd5f7da075dd3d7796594aa72d0a Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 11 Oct 2023 10:56:13 -0700 Subject: [PATCH] dri: Drop old createImageFromRenderbuffer() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... and rename createImageFromRenderbuffer2() to be it. We don't need to maintain the old function and struct layout, because we're version locked between loader and driver. Reviewed-by: Adam Jackson Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 26 +++++++------------------ src/gallium/frontends/dri/dri2.c | 3 --- src/gallium/frontends/dri/dri_helpers.c | 11 +---------- src/gallium/frontends/dri/dri_helpers.h | 4 ---- src/gallium/include/mesa_interface.h | 15 ++++---------- 5 files changed, 12 insertions(+), 47 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index b75798d01bf..7256d54a5e0 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2192,27 +2192,15 @@ dri2_create_image_khr_renderbuffer(_EGLDisplay *disp, _EGLContext *ctx, return EGL_NO_IMAGE_KHR; } - if (dri2_dpy->image->base.version >= 17 && - dri2_dpy->image->createImageFromRenderbuffer2) { - unsigned error = ~0; + unsigned error = ~0; + dri_image = dri2_dpy->image->createImageFromRenderbuffer( + dri2_ctx->dri_context, renderbuffer, NULL, &error); - dri_image = dri2_dpy->image->createImageFromRenderbuffer2( - dri2_ctx->dri_context, renderbuffer, NULL, &error); + assert(!!dri_image == (error == __DRI_IMAGE_ERROR_SUCCESS)); - assert(!!dri_image == (error == __DRI_IMAGE_ERROR_SUCCESS)); - - if (!dri_image) { - _eglError(egl_error_from_dri_image_error(error), - "dri2_create_image_khr"); - return EGL_NO_IMAGE_KHR; - } - } else { - dri_image = dri2_dpy->image->createImageFromRenderbuffer( - dri2_ctx->dri_context, renderbuffer, NULL); - if (!dri_image) { - _eglError(EGL_BAD_ALLOC, "dri2_create_image_khr"); - return EGL_NO_IMAGE_KHR; - } + if (!dri_image) { + _eglError(egl_error_from_dri_image_error(error), "dri2_create_image_khr"); + return EGL_NO_IMAGE_KHR; } return dri2_create_image_from_dri(disp, dri_image); diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 03d94fb1ade..1db72708b9c 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -2067,7 +2067,6 @@ static const __DRIimageExtension dri2ImageExtensionTempl = { .queryDmaBufFormats = NULL, .queryDmaBufModifiers = NULL, .queryDmaBufFormatModifierAttribs = NULL, - .createImageFromRenderbuffer2 = dri2_create_image_from_renderbuffer2, .createImageWithModifiers2 = NULL, .queryCompressionRates = NULL, .queryCompressionModifiers = NULL, @@ -2098,7 +2097,6 @@ const __DRIimageExtension driVkImageExtension = { .queryDmaBufFormats = dri2_query_dma_buf_formats, .queryDmaBufModifiers = dri2_query_dma_buf_modifiers, .queryDmaBufFormatModifierAttribs = dri2_query_dma_buf_format_modifier_attribs, - .createImageFromRenderbuffer2 = dri2_create_image_from_renderbuffer2, .createImageWithModifiers2 = dri2_create_image_with_modifiers2, }; @@ -2121,7 +2119,6 @@ const __DRIimageExtension driVkImageExtensionSw = { .getCapabilities = dri2_get_capabilities, .mapImage = dri2_map_image, .unmapImage = dri2_unmap_image, - .createImageFromRenderbuffer2 = dri2_create_image_from_renderbuffer2, }; static const __DRIrobustnessExtension dri2Robustness = { diff --git a/src/gallium/frontends/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c index 609c2411806..5614f1b0bb4 100644 --- a/src/gallium/frontends/dri/dri_helpers.c +++ b/src/gallium/frontends/dri/dri_helpers.c @@ -288,7 +288,7 @@ dri2_lookup_egl_image_validated(struct dri_screen *screen, void *handle) } __DRIimage * -dri2_create_image_from_renderbuffer2(__DRIcontext *context, +dri2_create_image_from_renderbuffer(__DRIcontext *context, int renderbuffer, void *loaderPrivate, unsigned *error) { @@ -356,15 +356,6 @@ dri2_create_image_from_renderbuffer2(__DRIcontext *context, return img; } -__DRIimage * -dri2_create_image_from_renderbuffer(__DRIcontext *context, - int renderbuffer, void *loaderPrivate) -{ - unsigned error; - return dri2_create_image_from_renderbuffer2(context, renderbuffer, - loaderPrivate, &error); -} - void dri2_destroy_image(__DRIimage *img) { diff --git a/src/gallium/frontends/dri/dri_helpers.h b/src/gallium/frontends/dri/dri_helpers.h index a0226987680..b17376b4c34 100644 --- a/src/gallium/frontends/dri/dri_helpers.h +++ b/src/gallium/frontends/dri/dri_helpers.h @@ -70,10 +70,6 @@ dri2_lookup_egl_image_validated(struct dri_screen *screen, void *handle); __DRIimage * dri2_create_image_from_renderbuffer(__DRIcontext *context, - int renderbuffer, void *loaderPrivate); - -__DRIimage * -dri2_create_image_from_renderbuffer2(__DRIcontext *context, int renderbuffer, void *loaderPrivate, unsigned *error); diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h index 33b81515d27..12d31a980c3 100644 --- a/src/gallium/include/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h @@ -1432,11 +1432,6 @@ struct __DRIimageExtensionRec { int name, int pitch, void *loaderPrivate); - /* Deprecated since version 17; see createImageFromRenderbuffer2 */ - __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context, - int renderbuffer, - void *loaderPrivate); - void (*destroyImage)(__DRIimage *image); __DRIimage *(*createImage)(__DRIscreen *screen, @@ -1674,13 +1669,11 @@ struct __DRIimageExtensionRec { * \param loaderPrivate for callbacks into the loader related to the image * \param error will be set to one of __DRI_IMAGE_ERROR_xxx * \return the newly created image on success, or NULL otherwise - * - * \since 17 */ - __DRIimage *(*createImageFromRenderbuffer2)(__DRIcontext *context, - int renderbuffer, - void *loaderPrivate, - unsigned *error); + __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context, + int renderbuffer, + void *loaderPrivate, + unsigned *error); /** * Like createImageFromFds, but takes additional attributes.