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

anv: Don't generate Gen10-specific functions

Browse Source 
v2: Re-wrap lines in meson.build.  Suggested by Jason.

v3: Also update Makefile.sources and Android build files.  Noticed by
Lionel.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> [v2]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6899>
This commit is contained in:
Ian Romanick
2020-09-24 13:29:00 -07:00
parent 5490f5cbce
commit fc04733f09
8 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/intel/Android.vulkan.mk
View File

@@ -147,27 +147,6 @@ LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
#
# libanv for gen10
#
include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_anv_gen10
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
LOCAL_CFLAGS := -DGEN_VERSIONx10=100
LOCAL_C_INCLUDES := $(VULKAN_COMMON_INCLUDES)
LOCAL_STATIC_LIBRARIES := $(ANV_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES)
LOCAL_HEADER_LIBRARIES += $(VULKAN_COMMON_HEADER_LIBRARIES)
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
#
# libanv for gen11
#
@@ -312,7 +291,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_anv_gen75 \
libmesa_anv_gen8 \
libmesa_anv_gen9 \
libmesa_anv_gen10 \
libmesa_anv_gen11 \
libmesa_anv_gen12 \
libmesa_intel_compiler