diff options
| author | Jan Zielinski <jan.zielinski@intel.com> | 2021-06-09 14:16:23 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-12-06 23:37:50 +0000 |
| commit | e2de00876a7033b6923f912af8d2b0bbd100e113 (patch) | |
| tree | 9842e1fa87532c02994355e386e9bf85c9db3565 /android | |
| parent | 855793c6c6bd372ea96681ecbd3f318ad71da223 (diff) | |
gallium/swr: Remove common code and build options
This commit removes all OpenSWR references from common Mesa code
and build system.
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11264>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 4 | ||||
| -rw-r--r-- | android/mesa3d_cross.mk | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/android/Android.mk b/android/Android.mk index 846907d553f..430b01a26b6 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -44,7 +44,7 @@ LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers libbacktrace_he MESON_GEN_PKGCONFIGS := backtrace cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf LOCAL_CFLAGS += $(BOARD_MESA3D_CFLAGS) -ifneq ($(filter swr swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) +ifneq ($(filter swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),) MESON_GEN_LLVM_STUB := true endif @@ -85,8 +85,6 @@ endif ifneq ($(MESON_GEN_LLVM_STUB),) MESON_LLVM_VERSION := 12.0.0 -# Required for swr gallium target -MESON_LLVM_IRBUILDER_PATH := external/llvm-project/llvm/include/llvm/IR/IRBuilder.h LOCAL_SHARED_LIBRARIES += libLLVM12 endif diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index e211cb8f269..b3cc09496a0 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -257,8 +257,7 @@ ifneq ($(MESON_GEN_LLVM_STUB),) mkdir -p $(dir $@)/subprojects/llvm/ echo -e "project('llvm', 'cpp', version : '$(MESON_LLVM_VERSION)')\n" \ "dep_llvm = declare_dependency()\n" \ - "has_rtti = false\n" \ - "irbuilder_h = files('$(AOSP_ABSOLUTE_PATH)/$(MESON_LLVM_IRBUILDER_PATH)')" > $(dir $@)/subprojects/llvm/meson.build + "has_rtti = false\n" > $(dir $@)/subprojects/llvm/meson.build endif $(MESON_GEN_NINJA) $(MESON_BUILD) |