diff options
| author | Rob Herring <robh@kernel.org> | 2016-01-21 07:58:46 -0600 |
|---|---|---|
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | 2016-03-17 10:54:50 +0800 |
| commit | 55002c84ee70b0d2447b05e720cb4d85ba0080b3 (patch) | |
| tree | 85bca308037d5b4ba3c90c3fa7addb0b0b0294a8 /Android.mk | |
| parent | 564c47171be849fe926986b03aedefaa0ef0da4e (diff) | |
| download | external_drm_gralloc-55002c84ee70b0d2447b05e720cb4d85ba0080b3.zip external_drm_gralloc-55002c84ee70b0d2447b05e720cb4d85ba0080b3.tar.gz external_drm_gralloc-55002c84ee70b0d2447b05e720cb4d85ba0080b3.tar.bz2 | |
pipe: use gallium loader function
Based on Rob Clark's work to avoid duplicating gallium driver loading
code and statically linking each driver's pipe and winsys libraries.
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 28 |
1 files changed, 6 insertions, 22 deletions
@@ -27,15 +27,15 @@ freedreno_drivers := freedreno intel_drivers := i915 i965 i915g ilo radeon_drivers := r300g r600g radeonsi nouveau_drivers := nouveau -vmwgfx_drivers := vmwgfx +pipe_drivers := freedreno virgl vmwgfx valid_drivers := \ prebuilt \ + $(pipe_drivers) \ $(freedreno_drivers) \ $(intel_drivers) \ $(radeon_drivers) \ - $(nouveau_drivers) \ - $(vmwgfx_drivers) + $(nouveau_drivers) # warn about invalid drivers invalid_drivers := $(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS)) @@ -45,12 +45,6 @@ $(warning invalid GPU drivers: $(invalid_drivers)) DRM_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(DRM_GPU_DRIVERS)) endif -ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),) -DRM_USES_PIPE := true -else -DRM_USES_PIPE := false -endif - ifneq ($(strip $(DRM_GPU_DRIVERS)),) LOCAL_PATH := $(call my-dir) @@ -122,32 +116,22 @@ LOCAL_CFLAGS += -DENABLE_NOUVEAU LOCAL_SHARED_LIBRARIES += libdrm_nouveau endif -ifeq ($(strip $(DRM_USES_PIPE)),true) +ifneq ($(filter $(pipe_drivers), $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += gralloc_drm_pipe.c LOCAL_CFLAGS += -DENABLE_PIPE LOCAL_C_INCLUDES += \ external/mesa/include \ external/mesa/src \ external/mesa/src/gallium/include \ - external/mesa/src/gallium/winsys \ - external/mesa/src/gallium/drivers \ external/mesa/src/gallium/auxiliary -ifneq ($(filter vmwgfx, $(DRM_GPU_DRIVERS)),) -LOCAL_CFLAGS += -DENABLE_PIPE_VMWGFX -LOCAL_STATIC_LIBRARIES += \ - libmesa_pipe_svga \ - libmesa_winsys_svga -LOCAL_C_INCLUDES += \ - external/mesa/src/gallium/drivers/svga/include -endif - LOCAL_STATIC_LIBRARIES += \ libmesa_gallium \ libmesa_util \ LOCAL_SHARED_LIBRARIES += libdl -endif # DRM_USES_PIPE +endif # pipe_drivers + include $(BUILD_SHARED_LIBRARY) |