diff options
author | Gurchetan Singh <[email protected]> | 2019-03-25 16:46:31 -0700 |
---|---|---|
committer | Gurchetan Singh <[email protected]> | 2019-03-27 17:26:21 +0000 |
commit | 95ad1744c11cb3e1e226eb598984108f20ac9a7f (patch) | |
tree | 290a3284f4339b0f77b347ae6d7a64274ecabd50 /src/egl/drivers | |
parent | 49d52539fb92e9f279906bdae56ddf281d770164 (diff) |
egl/android: move droid_open_device_drm_gralloc down a bit
1) Removes a forward declaration.
2) Makes next patch easier.
Suggested-by: Emil Velikov <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/egl/drivers')
-rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 0de68afc615..b9ba29f6979 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1206,33 +1206,6 @@ droid_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) return (config_count != 0); } -static EGLBoolean -droid_probe_device(_EGLDisplay *disp); - -#ifdef HAVE_DRM_GRALLOC -static EGLBoolean -droid_open_device_drm_gralloc(_EGLDisplay *disp) -{ - struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); - int fd = -1, err = -EINVAL; - - if (dri2_dpy->gralloc->perform) - err = dri2_dpy->gralloc->perform(dri2_dpy->gralloc, - GRALLOC_MODULE_PERFORM_GET_DRM_FD, - &fd); - if (err || fd < 0) { - _eglLog(_EGL_WARNING, "fail to get drm fd"); - return EGL_FALSE; - } - - dri2_dpy->fd = fcntl(fd, F_DUPFD_CLOEXEC, 3); - if (dri2_dpy->fd < 0) - return EGL_FALSE; - - return droid_probe_device(disp); -} -#endif /* HAVE_DRM_GRALLOC */ - static const struct dri2_egl_display_vtbl droid_display_vtbl = { .authenticate = NULL, .create_window_surface = droid_create_window_surface, @@ -1459,6 +1432,30 @@ droid_probe_device(_EGLDisplay *disp) return EGL_TRUE; } +#ifdef HAVE_DRM_GRALLOC +static EGLBoolean +droid_open_device_drm_gralloc(_EGLDisplay *disp) +{ + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); + int fd = -1, err = -EINVAL; + + if (dri2_dpy->gralloc->perform) + err = dri2_dpy->gralloc->perform(dri2_dpy->gralloc, + GRALLOC_MODULE_PERFORM_GET_DRM_FD, + &fd); + if (err || fd < 0) { + _eglLog(_EGL_WARNING, "fail to get drm fd"); + return EGL_FALSE; + } + + dri2_dpy->fd = fcntl(fd, F_DUPFD_CLOEXEC, 3); + if (dri2_dpy->fd < 0) + return EGL_FALSE; + + return droid_probe_device(disp); +} +#endif /* HAVE_DRM_GRALLOC */ + static EGLBoolean droid_open_device(_EGLDisplay *disp) { |