OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: use symlinks for driver loading

Browse Source 
Instead of having special driver loading logic for Android, create
symlinks to gallium_dri.so so we can use the standard loading logic.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Rob Herring
2017-05-22 19:04:48 -05:00
parent 4aaa21d12e
commit a3d98ca62f
14 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -516,15 +516,6 @@ dri2_open_driver(_EGLDisplay *disp)
/* not need continue to loop all paths once the driver is found */
if (dri2_dpy->driver != NULL)
break;
#ifdef ANDROID
snprintf(path, sizeof path, "%.*s/gallium_dri.so", len, p);
dri2_dpy->driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
if (dri2_dpy->driver == NULL)
_eglLog(_EGL_DEBUG, "failed to open %s: %s\n", path, dlerror());
else
break;
#endif
}
if (dri2_dpy->driver == NULL) {

1
src/gallium/drivers/freedreno/Android.mk
View File

@@ -50,6 +50,7 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_FREEDRENO),)
GALLIUM_TARGET_DRIVERS += msm
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_freedreno)
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
endif

1
src/gallium/drivers/i915/Android.mk
View File

@@ -36,5 +36,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_I915),)
GALLIUM_TARGET_DRIVERS += i915
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_i915)
endif

1
src/gallium/drivers/nouveau/Android.mk
View File

@@ -43,6 +43,7 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_NOUVEAU),)
GALLIUM_TARGET_DRIVERS += nouveau
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_nouveau)
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
endif

1
src/gallium/drivers/pl111/Android.mk
View File

@@ -34,5 +34,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_PL111),)
GALLIUM_TARGET_DRIVERS += pl111
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_pl111)
endif

1
src/gallium/drivers/r300/Android.mk
View File

@@ -42,6 +42,7 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_R300),)
GALLIUM_TARGET_DRIVERS += r300
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_radeon)
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
endif

1
src/gallium/drivers/r600/Android.mk
View File

@@ -49,6 +49,7 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_R600),)
GALLIUM_TARGET_DRIVERS += r600
$(eval GALLIUM_LIBS += \
$(LOCAL_MODULE) \
libmesa_winsys_radeon)

1
src/gallium/drivers/radeonsi/Android.mk
View File

@@ -49,6 +49,7 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_RADEONSI),)
GALLIUM_TARGET_DRIVERS += radeonsi
$(eval GALLIUM_LIBS += \
$(LOCAL_MODULE) \
$(LOCAL_STATIC_LIBRARIES) \

1
src/gallium/drivers/softpipe/Android.mk
View File

@@ -37,5 +37,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_SOFTPIPE),)
GALLIUM_TARGET_DRIVERS += swrast
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_sw_dri)
endif

1
src/gallium/drivers/svga/Android.mk
View File

@@ -40,5 +40,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_VMWGFX),)
GALLIUM_TARGET_DRIVERS := vmwgfx
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_svga)
endif

1
src/gallium/drivers/vc4/Android.mk
View File

@@ -38,5 +38,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_VC4),)
GALLIUM_TARGET_DRIVERS += vc4
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_vc4)
endif

1
src/gallium/drivers/virgl/Android.mk
View File

@@ -34,5 +34,6 @@ include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
ifneq ($(HAVE_GALLIUM_VIRGL),)
GALLIUM_TARGET_DRIVERS += virtio_gpu
$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_virgl libmesa_winsys_virgl_vtest)
endif

10
src/gallium/targets/dri/Android.mk
View File

@@ -58,5 +58,15 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
# sort GALLIUM_SHARED_LIBS to remove any duplicates
LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS))
ifneq ($(filter 5 6 7, $(MESA_ANDROID_MAJOR_VERSION)),)
LOCAL_POST_INSTALL_CMD := \
$(foreach l, lib lib64, \
mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/$(l)/$(MESA_DRI_MODULE_REL_PATH); \
$(foreach d, $(GALLIUM_TARGET_DRIVERS), ln -sf gallium_dri.so $(TARGET_OUT)/$(l)/$(MESA_DRI_MODULE_REL_PATH)/$(d)_dri.so;) \
)
else
LOCAL_MODULE_SYMLINKS := $(foreach d, $(GALLIUM_TARGET_DRIVERS), $(d)_dri.so)
endif
include $(GALLIUM_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)

9
src/gbm/backends/dri/gbm_dri.c
View File

@@ -354,15 +354,6 @@ dri_open_driver(struct gbm_dri_device *dri)
/* not need continue to loop all paths once the driver is found */
if (dri->driver != NULL)
break;
#ifdef ANDROID
snprintf(path, sizeof path, "%.*s/gallium_dri.so", len, p);
dri->driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
if (dri->driver == NULL)
sprintf("failed to open %s: %s\n", path, dlerror());
else
break;
#endif
}
if (dri->driver == NULL) {