diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-07-22 10:57:22 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-08-07 19:58:30 +0000 |
| commit | 6db246c960ff04b4e32351f2f1a40c912d0b9956 (patch) | |
| tree | f4fac0a3c0465a0f3c992fc4f7c6706af8a3db3e | |
| parent | 78714a4328133ab57461de0cd7ba156a9b710c07 (diff) | |
egl: fixup _eglFilterConfigArray() params and drop _eglFallbackMatch() wrapper
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24292>
| -rw-r--r-- | src/egl/main/eglconfig.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index ffe0654db7d..e962c6f32e3 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -702,7 +702,8 @@ _eglSortConfigs(const _EGLConfig **configs, EGLint count, static EGLBoolean _eglFilterConfigArray(_EGLArray *array, EGLConfig *configs, EGLint config_size, EGLint *num_configs, - EGLBoolean (*match)(const _EGLConfig *, void *), + EGLBoolean (*match)(const _EGLConfig *, + const _EGLConfig *), EGLint (*compare)(const _EGLConfig *, const _EGLConfig *, void *), void *priv_data) @@ -741,12 +742,6 @@ _eglFilterConfigArray(_EGLArray *array, EGLConfig *configs, EGLint config_size, return EGL_TRUE; } -static EGLBoolean -_eglFallbackMatch(const _EGLConfig *conf, void *priv_data) -{ - return _eglMatchConfig(conf, (const _EGLConfig *)priv_data); -} - static EGLint _eglFallbackCompare(const _EGLConfig *conf1, const _EGLConfig *conf2, void *priv_data) @@ -769,7 +764,7 @@ _eglChooseConfig(_EGLDisplay *disp, const EGLint *attrib_list, return _eglError(EGL_BAD_ATTRIBUTE, "eglChooseConfig"); result = _eglFilterConfigArray(disp->Configs, configs, config_size, - num_configs, _eglFallbackMatch, + num_configs, _eglMatchConfig, _eglFallbackCompare, (void *)&criteria); if (result && (_eglGetLogLevel() == _EGL_DEBUG)) |