diff options
| author | Gurchetan Singh <[email protected]> | 2019-03-25 16:50:46 -0700 |
|---|---|---|
| committer | Gurchetan Singh <[email protected]> | 2019-03-27 17:26:21 +0000 |
| commit | f1dd1be0c2d45293b85ec667f29960d2ecf5b0bd (patch) | |
| tree | 9b500508dc94336598454f8803b1486ffe7ef5ab /src/egl | |
| parent | 95ad1744c11cb3e1e226eb598984108f20ac9a7f (diff) | |
egl/android: droid_open_device_drm_gralloc --> droid_open_device
Makes things easier to follow.
Suggested-by: Emil Velikov <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index b9ba29f6979..423d685bfa8 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -1434,7 +1434,7 @@ droid_probe_device(_EGLDisplay *disp) #ifdef HAVE_DRM_GRALLOC static EGLBoolean -droid_open_device_drm_gralloc(_EGLDisplay *disp) +droid_open_device(_EGLDisplay *disp) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); int fd = -1, err = -EINVAL; @@ -1454,8 +1454,7 @@ droid_open_device_drm_gralloc(_EGLDisplay *disp) return droid_probe_device(disp); } -#endif /* HAVE_DRM_GRALLOC */ - +#else static EGLBoolean droid_open_device(_EGLDisplay *disp) { @@ -1526,6 +1525,8 @@ droid_open_device(_EGLDisplay *disp) #undef MAX_DRM_DEVICES } +#endif + EGLBoolean dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) { @@ -1552,11 +1553,7 @@ dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp) disp->DriverData = (void *) dri2_dpy; -#ifdef HAVE_DRM_GRALLOC - if (!droid_open_device_drm_gralloc(disp)) { -#else if (!droid_open_device(disp)) { -#endif err = "DRI2: failed to open device"; goto cleanup; } |