From 0c859fd2780ddd697ae62ff2235f957f02efacc7 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 23 Oct 2023 17:24:23 -0700 Subject: [PATCH] dri: Collapse dri2_validate_egl_image() into dri_validate_egl_image() Unnecessary indirection. Part-of: --- src/gallium/frontends/dri/dri_helpers.c | 11 ----------- src/gallium/frontends/dri/dri_screen.c | 7 +++++-- src/gallium/frontends/dri/dri_screen.h | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/gallium/frontends/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c index 5cccdda89f6..1c9a01f325e 100644 --- a/src/gallium/frontends/dri/dri_helpers.c +++ b/src/gallium/frontends/dri/dri_helpers.c @@ -271,17 +271,6 @@ dri2_lookup_egl_image(struct dri_screen *screen, void *handle) return img; } -bool -dri2_validate_egl_image(struct dri_screen *screen, void *handle) -{ - const __DRIimageLookupExtension *loader = screen->dri2.image; - - if (loader) - return loader->validateEGLImage(handle, screen->loaderPrivate); - else - return true; -} - __DRIimage * dri2_lookup_egl_image_validated(struct dri_screen *screen, void *handle) { diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c index a60b6b360ef..35544faf577 100644 --- a/src/gallium/frontends/dri/dri_screen.c +++ b/src/gallium/frontends/dri/dri_screen.c @@ -541,8 +541,12 @@ dri_validate_egl_image(struct pipe_frontend_screen *fscreen, void *egl_image) { struct dri_screen *screen = (struct dri_screen *)fscreen; + const __DRIimageLookupExtension *loader = screen->dri2.image; - return screen->validate_egl_image(screen, egl_image); + if (loader) + return loader->validateEGLImage(egl_image, screen->loaderPrivate); + else + return true; } static int @@ -623,7 +627,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; - screen->validate_egl_image = dri2_validate_egl_image; const __DRIimageLookupExtension *image = screen->dri2.image; if (image && image->base.version >= 2 && diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h index c9d6ab743a6..72c5ea64ec6 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); - bool (*validate_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. */