android: use gralloc_drm_get_gem_handle api

Currently a gralloc internal structure is exposed to Mesa,
Use a query function instead to maintain ABI compatibility.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 7ede48de69c5149dcec83f391277d949a14e015e..3432f18b047bfda7c096d32141449f03c502a116 100644 (file)
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -41,6 +41,7 @@
 #include <radeon_drm.h>
 
 #include "egl_dri2.h"
+#include "gralloc_drm.h"
 
 static int
 get_format_bpp(int native)
@@ -72,12 +73,7 @@ get_format_bpp(int native)
 static int
 get_native_buffer_name(struct ANativeWindowBuffer *buf)
 {
-   struct gralloc_drm_handle_t *handle;
-
-   /* check that the buffer is allocated by drm_gralloc and cast */
-   handle = gralloc_drm_handle(buf->handle);
-
-   return (handle) ? handle->name : 0;
+   return gralloc_drm_get_gem_handle(buf->handle);
 }
 
 static EGLBoolean

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index 97e4860211a77f72a680dd263237862ca39ef660..3751ecfe41b3c156a38733c46fab9170772a0af1 100644 (file)
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -65,7 +65,9 @@ LOCAL_SHARED_LIBRARIES := \
        libdl \
        libhardware \
        liblog \
-       libcutils
+       libcutils \
+       libgralloc_drm \
+
 
 # add libdrm if there are hardware drivers
 ifneq ($(MESA_GPU_DRIVERS),swrast)

diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp
index 267727d5d993325b8353411f87962779d3a2583c..391decc0e7a7228145e754cf8650665bfca9e260 100644 (file)
--- a/src/gallium/state_trackers/egl/android/native_android.cpp
+++ b/src/gallium/state_trackers/egl/android/native_android.cpp
@@ -147,18 +147,12 @@ get_pipe_format(int native)
 
 #ifndef ANDROID_BACKEND_NO_DRM
 
-#include <gralloc_drm_handle.h>
+#include <gralloc_drm.h>
 static int
 get_handle_name(buffer_handle_t handle)
 {
-   struct gralloc_drm_handle_t *dh;
-
-   /* check that the buffer is allocated by drm_gralloc and cast */
-   dh = gralloc_drm_handle(handle);
-
-   return (dh) ? dh->name : 0;
+   return gralloc_drm_get_gem_handle(handle);
 }
-
 #else
 
 static int