Mesa (master): egl/android: move droid_image_loader_extension down a bit

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 49d52539fb92e9f279906bdae56ddf281d770164
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49d52539fb92e9f279906bdae56ddf281d770164

Author: Gurchetan Singh <gurchetansingh at chromium.org>
Date:   Mon Mar 25 16:44:34 2019 -0700

egl/android: move droid_image_loader_extension down a bit

This removes some #ifdefs.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 src/egl/drivers/dri2/platform_android.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 81b8282a653..0de68afc615 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -1268,17 +1268,7 @@ static const __DRIdri2LoaderExtension droid_dri2_loader_extension = {
    .getBuffersWithFormat = droid_get_buffers_with_format,
    .getCapability        = droid_get_capability,
 };
-#endif /* HAVE_DRM_GRALLOC */
-
-static const __DRIimageLoaderExtension droid_image_loader_extension = {
-   .base = { __DRI_IMAGE_LOADER, 2 },
-
-   .getBuffers          = droid_image_get_buffers,
-   .flushFrontBuffer    = droid_flush_front_buffer,
-   .getCapability       = droid_get_capability,
-};
 
-#ifdef HAVE_DRM_GRALLOC
 static const __DRIextension *droid_dri2_loader_extensions[] = {
    &droid_dri2_loader_extension.base,
    &image_lookup_extension.base,
@@ -1290,6 +1280,14 @@ static const __DRIextension *droid_dri2_loader_extensions[] = {
 };
 #endif /* HAVE_DRM_GRALLOC */
 
+static const __DRIimageLoaderExtension droid_image_loader_extension = {
+   .base = { __DRI_IMAGE_LOADER, 2 },
+
+   .getBuffers          = droid_image_get_buffers,
+   .flushFrontBuffer    = droid_flush_front_buffer,
+   .getCapability       = droid_get_capability,
+};
+
 static void
 droid_display_shared_buffer(__DRIdrawable *driDrawable, int fence_fd,
                             void *loaderPrivate)