fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: use gralloc_drm_get_gem_handle api

Browse source 
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>
This commit is contained in:
Tapani Pälli 2013-01-24 09:56:47 +02:00 • committed by Chad Versace
parent 8e4bb4bc09
commit 407029591c
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

4
src/egl/main/Android.mk
View file

@ -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)

10
src/gallium/state_trackers/egl/android/native_android.cpp
View file

@ -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