fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 15:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: drop unused _EGLDriver from {Create,Export}DRMImageMESA()

Browse source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>
This commit is contained in:
Eric Engestrom 2018-04-22 16:48:15 +02:00 • committed by Marge Bot
parent 692b9c6ed0
commit 9d5162eddf
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/egl/drivers/dri2/egl_dri2.c
View file

@ -2902,8 +2902,7 @@ dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx,
return res;
}
static _EGLImage *
dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp,
const EGLint *attr_list)
dri2_create_drm_image_mesa(_EGLDisplay *disp, const EGLint *attr_list)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_image *dri2_img;
@ -2911,8 +2910,6 @@ dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp,
unsigned int dri_use, valid_mask;
int format;
(void) drv;
if (!attr_list) {
_eglError(EGL_BAD_PARAMETER, __func__);
return EGL_NO_IMAGE_KHR;
@ -2974,14 +2971,12 @@ dri2_create_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp,
}
static EGLBoolean
dri2_export_drm_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *img,
dri2_export_drm_image_mesa(_EGLDisplay *disp, _EGLImage *img,
EGLint *name, EGLint *handle, EGLint *stride)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_image *dri2_img = dri2_egl_image(img);
(void) drv;
if (name && !dri2_dpy->image->queryImage(dri2_img->dri_image,
__DRI_IMAGE_ATTRIB_NAME, name))
return _eglError(EGL_BAD_ALLOC, "dri2_export_drm_image_mesa");

4
src/egl/main/eglapi.c
View file

@ -2205,7 +2205,7 @@ eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attr_list)
if (!disp->Extensions.MESA_drm_image)
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
img = drv->CreateDRMImageMESA(drv, disp, attr_list);
img = drv->CreateDRMImageMESA(disp, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret);
@ -2228,7 +2228,7 @@ eglExportDRMImageMESA(EGLDisplay dpy, EGLImage image,
if (!img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
ret = drv->ExportDRMImageMESA(drv, disp, img, name, handle, stride);
ret = drv->ExportDRMImageMESA(disp, img, name, handle, stride);
RETURN_EGL_EVAL(disp, ret);
}

9
src/egl/main/egldriver.h
View file

@ -147,11 +147,10 @@ struct _egl_driver
EGLBoolean (*SwapBuffersRegionNOK)(_EGLDisplay *disp, _EGLSurface *surf,
EGLint numRects, const EGLint *rects);
_EGLImage *(*CreateDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp,
const EGLint *attr_list);
EGLBoolean (*ExportDRMImageMESA)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLImage *img, EGLint *name,
EGLint *handle, EGLint *stride);
_EGLImage *(*CreateDRMImageMESA)(_EGLDisplay *disp, const EGLint *attr_list);
EGLBoolean (*ExportDRMImageMESA)(_EGLDisplay *disp, _EGLImage *img,
EGLint *name, EGLint *handle,
EGLint *stride);
EGLBoolean (*BindWaylandDisplayWL)(const _EGLDriver *drv, _EGLDisplay *disp,
struct wl_display *display);