fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl/android: do not indent HAVE_DRM_GRALLOC preprocessor directive

Browse source 
Fixes: 3f7bca44d9 ("egl/android: #ifdef out flink name support")
Fixes: c7bb82136b ("egl/android: Add DRM node probing and filtering")
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
(cherry picked from commit ac0856ae41)
This commit is contained in:
Mauro Rossi 2018-08-15 14:46:25 +02:00 • committed by Andres Gomez
parent f847a26873
commit ebbd7bcfdf
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/egl/drivers/dri2/platform_android.c
View file

@ -1226,7 +1226,7 @@ droid_load_driver(_EGLDisplay *disp)
dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER; dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
if (!dri2_dpy->is_render_node) { if (!dri2_dpy->is_render_node) {
#ifdef HAVE_DRM_GRALLOC #ifdef HAVE_DRM_GRALLOC
/* Handle control nodes using __DRI_DRI2_LOADER extension and GEM names /* Handle control nodes using __DRI_DRI2_LOADER extension and GEM names
* for backwards compatibility with drm_gralloc. (Do not use on new * for backwards compatibility with drm_gralloc. (Do not use on new
* systems.) */ * systems.) */
@ -1235,10 +1235,10 @@ droid_load_driver(_EGLDisplay *disp)
err = "DRI2: failed to load driver"; err = "DRI2: failed to load driver";
goto error; goto error;
} }
#else #else
err = "DRI2: handle is not for a render node"; err = "DRI2: handle is not for a render node";
goto error; goto error;
#endif #endif
} else { } else {
dri2_dpy->loader_extensions = droid_image_loader_extensions; dri2_dpy->loader_extensions = droid_image_loader_extensions;
if (!dri2_load_driver_dri3(disp)) { if (!dri2_load_driver_dri3(disp)) {