From 3e91c7d54494397fcdd74b54bee18c991283e831 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Mon, 15 Apr 2019 12:32:43 +0800 Subject: [PATCH] lima: add Android build Currently only meson build supported is added for lima driver. Add Android build support for lima. Signed-off-by: Icenowy Zheng Acked-by: Qiang Yu --- Android.mk | 5 +- src/gallium/Android.mk | 1 + src/gallium/drivers/lima/Android.mk | 88 ++++++++++++++++++++++++++ src/gallium/winsys/lima/drm/Android.mk | 32 ++++++++++ 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 src/gallium/drivers/lima/Android.mk create mode 100644 src/gallium/winsys/lima/drm/Android.mk diff --git a/Android.mk b/Android.mk index 3b9a54058e0..d2b12ea4473 100644 --- a/Android.mk +++ b/Android.mk @@ -24,7 +24,7 @@ # BOARD_GPU_DRIVERS should be defined. The valid values are # # classic drivers: i915 i965 -# gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris +# gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima # # The main target is libGLES_mesa. For each classic driver enabled, a DRI # module will also be built. DRI modules will be loaded by libGLES_mesa. @@ -60,7 +60,8 @@ gallium_drivers := \ vc4.HAVE_GALLIUM_VC4 \ virgl.HAVE_GALLIUM_VIRGL \ etnaviv.HAVE_GALLIUM_ETNAVIV \ - iris.HAVE_GALLIUM_IRIS + iris.HAVE_GALLIUM_IRIS \ + lima.HAVE_GALLIUM_LIMA ifeq ($(BOARD_GPU_DRIVERS),all) MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers))) diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 870aa92d7a8..3a3f042c7a4 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -48,6 +48,7 @@ SUBDIRS += winsys/svga/drm drivers/svga SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly SUBDIRS += state_trackers/dri SUBDIRS += winsys/iris/drm drivers/iris +SUBDIRS += winsys/lima/drm drivers/lima # sort to eliminate any duplicates INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS))) diff --git a/src/gallium/drivers/lima/Android.mk b/src/gallium/drivers/lima/Android.mk new file mode 100644 index 00000000000..eb8653e8524 --- /dev/null +++ b/src/gallium/drivers/lima/Android.mk @@ -0,0 +1,88 @@ +# Copyright (C) 2019 Icenowy Zheng +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + ir/gp/codegen.c \ + ir/gp/codegen.h \ + ir/gp/disasm.c \ + ir/gp/gpir.h \ + ir/gp/instr.c \ + ir/gp/lower.c \ + ir/gp/nir.c \ + ir/gp/node.c \ + ir/gp/physical_regalloc.c \ + ir/gp/reduce_scheduler.c \ + ir/gp/scheduler.c \ + ir/gp/value_regalloc.c \ + ir/lima_ir.h \ + ir/lima_nir_lower_uniform_to_scalar.c \ + ir/pp/codegen.c \ + ir/pp/codegen.h \ + ir/pp/disasm.c \ + ir/pp/instr.c \ + ir/pp/lower.c \ + ir/pp/nir.c \ + ir/pp/node.c \ + ir/pp/node_to_instr.c \ + ir/pp/ppir.h \ + ir/pp/regalloc.c \ + ir/pp/scheduler.c \ + lima_bo.c \ + lima_bo.h \ + lima_context.c \ + lima_context.h \ + lima_draw.c \ + lima_fence.c \ + lima_fence.h \ + lima_program.c \ + lima_program.h \ + lima_query.c \ + lima_resource.c \ + lima_resource.h \ + lima_screen.c \ + lima_screen.h \ + lima_state.c \ + lima_submit.c \ + lima_submit.h \ + lima_texture.c \ + lima_texture.h \ + lima_tiling.c \ + lima_tiling.h \ + lima_util.c \ + lima_util.h + +LOCAL_MODULE := libmesa_pipe_lima + +LOCAL_SHARED_LIBRARIES := libdrm + +LOCAL_STATIC_LIBRARIES := libmesa_nir + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +ifneq ($(HAVE_GALLIUM_LIMA),) +GALLIUM_TARGET_DRIVERS += lima +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_lima) +$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) +endif diff --git a/src/gallium/winsys/lima/drm/Android.mk b/src/gallium/winsys/lima/drm/Android.mk new file mode 100644 index 00000000000..cd5e5ad5678 --- /dev/null +++ b/src/gallium/winsys/lima/drm/Android.mk @@ -0,0 +1,32 @@ +# Copyright (C) 2019 Icenowy Zheng +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + lima_drm_public.h \ + lima_drm_winsys.c + +LOCAL_MODULE := libmesa_winsys_lima + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY)