dri: Collapse dri2_validate_egl_image() into dri_validate_egl_image()
Unnecessary indirection. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30245>
This commit is contained in:
@@ -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)
|
||||
{
|
||||
|
@@ -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 &&
|
||||
|
@@ -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. */
|
||||
|
Reference in New Issue
Block a user