diff --git a/src/gallium/frontends/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c index 1c9a01f325e..e6f0bd1ed8a 100644 --- a/src/gallium/frontends/dri/dri_helpers.c +++ b/src/gallium/frontends/dri/dri_helpers.c @@ -271,14 +271,6 @@ dri2_lookup_egl_image(struct dri_screen *screen, void *handle) return img; } -__DRIimage * -dri2_lookup_egl_image_validated(struct dri_screen *screen, void *handle) -{ - const __DRIimageLookupExtension *loader = screen->dri2.image; - - return loader->lookupEGLImageValidated(handle, screen->loaderPrivate); -} - __DRIimage * dri2_create_image_from_renderbuffer(__DRIcontext *context, int renderbuffer, void *loaderPrivate, diff --git a/src/gallium/frontends/dri/dri_helpers.h b/src/gallium/frontends/dri/dri_helpers.h index b17376b4c34..2877eca4fc8 100644 --- a/src/gallium/frontends/dri/dri_helpers.h +++ b/src/gallium/frontends/dri/dri_helpers.h @@ -65,9 +65,6 @@ dri2_lookup_egl_image(struct dri_screen *screen, void *handle); bool dri2_validate_egl_image(struct dri_screen *screen, void *handle); -__DRIimage * -dri2_lookup_egl_image_validated(struct dri_screen *screen, void *handle); - __DRIimage * dri2_create_image_from_renderbuffer(__DRIcontext *context, int renderbuffer, void *loaderPrivate, diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c index 35544faf577..2ac6966a452 100644 --- a/src/gallium/frontends/dri/dri_screen.c +++ b/src/gallium/frontends/dri/dri_screen.c @@ -500,14 +500,11 @@ dri_get_egl_image(struct pipe_frontend_screen *fscreen, struct st_egl_image *stimg) { struct dri_screen *screen = (struct dri_screen *)fscreen; + const __DRIimageLookupExtension *loader = screen->dri2.image; __DRIimage *img = NULL; const struct dri2_format_mapping *map; - if (screen->lookup_egl_image_validated) { - img = screen->lookup_egl_image_validated(screen, egl_image); - } else if (screen->lookup_egl_image) { - img = screen->lookup_egl_image(screen, egl_image); - } + img = loader->lookupEGLImageValidated(egl_image, screen->loaderPrivate); if (!img) return false; @@ -627,13 +624,6 @@ dri_init_screen(struct dri_screen *screen, screen->base.validate_egl_image = dri_validate_egl_image; screen->lookup_egl_image = dri2_lookup_egl_image; - const __DRIimageLookupExtension *image = screen->dri2.image; - if (image && - image->base.version >= 2 && - image->validateEGLImage && - image->lookupEGLImageValidated) { - screen->lookup_egl_image_validated = dri2_lookup_egl_image_validated; - } if (pscreen->get_param(pscreen, PIPE_CAP_NPOT_TEXTURES)) screen->target = PIPE_TEXTURE_2D; diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h index 72c5ea64ec6..65deb31ef35 100644 --- a/src/gallium/frontends/dri/dri_screen.h +++ b/src/gallium/frontends/dri/dri_screen.h @@ -113,7 +113,6 @@ struct dri_screen /* hooks filled in by dri2 & drisw */ __DRIimage * (*lookup_egl_image)(struct dri_screen *ctx, void *handle); - __DRIimage * (*lookup_egl_image_validated)(struct dri_screen *ctx, void *handle); /* DRI exts that vary based on gallium pipe_screen caps. */ __DRIimageExtension image_extension;