mirror of https://gitlab.freedesktop.org/mesa/mesa
android: Depend on gallium_dri from EGL, instead of linking in gallium.
The Android gallium build used to use gallium_egl, which was removed back in March. Instead, we will now use a normal Mesa libEGL loader with dlopen()ing of a DRI module. v2: add a clean step to rebuild all dri modules properly. v3: Squish the 2 patches doing this together (change by anholt). Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
933df3d335
commit
ac296aee58
|
@ -89,13 +89,9 @@ SUBDIRS := \
|
||||||
src/glsl \
|
src/glsl \
|
||||||
src/mesa \
|
src/mesa \
|
||||||
src/util \
|
src/util \
|
||||||
src/egl/main
|
src/egl/main \
|
||||||
|
|
||||||
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
|
|
||||||
SUBDIRS += \
|
|
||||||
src/egl/drivers/dri2 \
|
src/egl/drivers/dri2 \
|
||||||
src/mesa/drivers/dri
|
src/mesa/drivers/dri
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
|
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
|
||||||
SUBDIRS += src/gallium
|
SUBDIRS += src/gallium
|
||||||
|
|
|
@ -13,3 +13,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_int
|
||||||
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates)
|
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates)
|
||||||
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
|
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
|
||||||
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
|
$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
|
||||||
|
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)
|
||||||
|
|
|
@ -43,8 +43,6 @@ LOCAL_CFLAGS := \
|
||||||
-D_EGL_DRIVER_SEARCH_DIR=\"/system/lib/egl\" \
|
-D_EGL_DRIVER_SEARCH_DIR=\"/system/lib/egl\" \
|
||||||
-D_EGL_OS_UNIX=1
|
-D_EGL_OS_UNIX=1
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES :=
|
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
libglapi \
|
libglapi \
|
||||||
libdl \
|
libdl \
|
||||||
|
@ -62,95 +60,20 @@ ifneq ($(MESA_GPU_DRIVERS),swrast)
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm
|
LOCAL_SHARED_LIBRARIES += libdrm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
|
|
||||||
LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
|
LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
|
||||||
LOCAL_STATIC_LIBRARIES += libmesa_egl_dri2
|
|
||||||
|
|
||||||
|
ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
|
||||||
# require i915_dri and/or i965_dri
|
# require i915_dri and/or i965_dri
|
||||||
LOCAL_REQUIRED_MODULES += \
|
LOCAL_REQUIRED_MODULES += \
|
||||||
$(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
|
$(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
|
||||||
endif # MESA_BUILD_CLASSIC
|
endif # MESA_BUILD_CLASSIC
|
||||||
|
|
||||||
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
|
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
|
||||||
|
LOCAL_REQUIRED_MODULES += gallium_dri
|
||||||
gallium_DRIVERS :=
|
|
||||||
|
|
||||||
# swrast
|
|
||||||
gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_android
|
|
||||||
|
|
||||||
# freedreno
|
|
||||||
ifneq ($(filter freedreno, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_freedreno libmesa_pipe_freedreno
|
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm_freedreno
|
|
||||||
endif
|
|
||||||
|
|
||||||
# i915g
|
|
||||||
ifneq ($(filter i915g, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_i915 libmesa_pipe_i915
|
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm_intel
|
|
||||||
endif
|
|
||||||
|
|
||||||
# ilo
|
|
||||||
ifneq ($(filter ilo, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_intel libmesa_pipe_ilo
|
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm_intel
|
|
||||||
endif
|
|
||||||
|
|
||||||
# nouveau
|
|
||||||
ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_nouveau libmesa_pipe_nouveau
|
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm_nouveau
|
|
||||||
LOCAL_SHARED_LIBRARIES += libstlport
|
|
||||||
endif
|
|
||||||
|
|
||||||
# r300g/r600g/radeonsi
|
|
||||||
ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_radeon
|
|
||||||
LOCAL_SHARED_LIBRARIES += libdrm_radeon
|
|
||||||
ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_pipe_r300
|
|
||||||
endif # r300g
|
|
||||||
ifneq ($(filter r600g radeonsi, $(MESA_GPU_DRIVERS)),)
|
|
||||||
ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_pipe_r600
|
|
||||||
LOCAL_SHARED_LIBRARIES += libstlport
|
|
||||||
endif # r600g
|
|
||||||
ifneq ($(filter radeonsi, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_pipe_radeonsi
|
|
||||||
endif # radeonsi
|
|
||||||
gallium_DRIVERS += libmesa_pipe_radeon
|
|
||||||
endif # r600g || radeonsi
|
|
||||||
endif # r300g || r600g || radeonsi
|
|
||||||
|
|
||||||
# vmwgfx
|
|
||||||
ifneq ($(filter vmwgfx, $(MESA_GPU_DRIVERS)),)
|
|
||||||
gallium_DRIVERS += libmesa_winsys_svga libmesa_pipe_svga
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# Notes about the order here:
|
|
||||||
#
|
|
||||||
# * libmesa_st_egl depends on libmesa_winsys_sw_android in $(gallium_DRIVERS)
|
|
||||||
# * libmesa_pipe_r300 in $(gallium_DRIVERS) depends on libmesa_st_mesa and
|
|
||||||
# libmesa_glsl
|
|
||||||
# * libmesa_st_mesa depends on libmesa_glsl
|
|
||||||
# * libmesa_glsl depends on libmesa_glsl_utils
|
|
||||||
#
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
|
||||||
libmesa_egl_gallium \
|
|
||||||
libmesa_st_egl \
|
|
||||||
$(gallium_DRIVERS) \
|
|
||||||
libmesa_st_mesa \
|
|
||||||
libmesa_util \
|
|
||||||
libmesa_glsl \
|
|
||||||
libmesa_glsl_utils \
|
|
||||||
libmesa_gallium \
|
|
||||||
$(LOCAL_STATIC_LIBRARIES)
|
|
||||||
|
|
||||||
endif # MESA_BUILD_GALLIUM
|
endif # MESA_BUILD_GALLIUM
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := \
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
$(LOCAL_STATIC_LIBRARIES) \
|
libmesa_egl_dri2 \
|
||||||
libmesa_loader
|
libmesa_loader
|
||||||
|
|
||||||
LOCAL_MODULE := libGLES_mesa
|
LOCAL_MODULE := libGLES_mesa
|
||||||
|
|
Loading…
Reference in New Issue