OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: drop unused _EGLDriver from MesaGLInteropEGL{QueryDeviceInfo,ExportObject}()

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
2020-08-03 22:48:10 +02:00
committed by Marge Bot
parent 5eb5847d48
commit 37be01bff7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/egl/main/eglapi.c
View File

@@ -2764,8 +2764,7 @@ eglGetProcAddress(const char *procname)
static int
_eglLockDisplayInterop(EGLDisplay dpy, EGLContext context,
_EGLDisplay **disp, const _EGLDriver **drv,
_EGLContext **ctx)
_EGLDisplay **disp, _EGLContext **ctx)
{
*disp = _eglLockDisplay(dpy);
@@ -2775,8 +2774,6 @@ _eglLockDisplayInterop(EGLDisplay dpy, EGLContext context,
return MESA_GLINTEROP_INVALID_DISPLAY;
}
*drv = (*disp)->Driver;
*ctx = _eglLookupContext(context, *disp);
if (!*ctx ||
((*ctx)->ClientAPI != EGL_OPENGL_API &&
@@ -2793,11 +2790,10 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context,
struct mesa_glinterop_device_info *out)
{
_EGLDisplay *disp;
const _EGLDriver *drv;
_EGLContext *ctx;
int ret;
ret = _eglLockDisplayInterop(dpy, context, &disp, &drv, &ctx);
ret = _eglLockDisplayInterop(dpy, context, &disp, &ctx);
if (ret != MESA_GLINTEROP_SUCCESS)
return ret;
@@ -2816,11 +2812,10 @@ MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context,
struct mesa_glinterop_export_out *out)
{
_EGLDisplay *disp;
const _EGLDriver *drv;
_EGLContext *ctx;
int ret;
ret = _eglLockDisplayInterop(dpy, context, &disp, &drv, &ctx);
ret = _eglLockDisplayInterop(dpy, context, &disp, &ctx);
if (ret != MESA_GLINTEROP_SUCCESS)
return ret;