fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dri: Fold lookup_egl_image_validated into its one caller

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30245>
This commit is contained in:
Emma Anholt 2023-10-24 14:58:51 -07:00 • committed by Marge Bot
parent 0c859fd278
commit 733b7002e7
4 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/frontends/dri/dri_helpers.c
View file

@ -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,

3
src/gallium/frontends/dri/dri_helpers.h
View file

@ -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,

14
src/gallium/frontends/dri/dri_screen.c
View file

@ -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;

1
src/gallium/frontends/dri/dri_screen.h
View file

@ -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;