Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "switch to swiftshaders for bring up"

Browse source
This commit is contained in:
Ivan Zaitsev 2022-06-29 19:04:42 +00:00 • committed by Android (Google) Code Review
commit 39439fa068
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BoardConfig-common.mk
View file

@ -109,7 +109,7 @@ BOARD_USES_ALIGN_RESTRICTION := false
BOARD_USES_GRALLOC_ION_SYNC := true BOARD_USES_GRALLOC_ION_SYNC := true
# This should be the same value as USE_SWIFTSHADER in device.mk # This should be the same value as USE_SWIFTSHADER in device.mk
BOARD_USES_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := true
# Gralloc4 # Gralloc4
ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)

36
device.mk
View file

@ -170,7 +170,8 @@ endif
# GRAPHICS - GPU (begin) # GRAPHICS - GPU (begin)
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := false #USE_SWIFTSHADER := false
USE_SWIFTSHADER := true
# HWUI # HWUI
TARGET_USES_VULKAN = true TARGET_USES_VULKAN = true
@ -191,11 +192,20 @@ PRODUCT_PACKAGES += \
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libGLESv1_CM_swiftshader \ libEGL_angle \
libEGL_swiftshader \ libGLESv1_CM_angle \
libGLESv2_swiftshader libGLESv2_angle \
vulkan.pastel
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl=angle \
ro.hardware.vulkan=pastel
else
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.vulkan=mali
endif endif
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@ -204,15 +214,15 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
ifeq ($(USE_SWIFTSHADER),true) #ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ #PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader \ # ro.hardware.egl = swiftshader \
ro.hardware.vulkan = pastel # ro.hardware.vulkan = pastel
else #else
PRODUCT_VENDOR_PROPERTIES += \ #PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali \ # ro.hardware.egl = mali \
ro.hardware.vulkan = mali # ro.hardware.vulkan = mali
endif #endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.opengles.version=196610 \ ro.opengles.version=196610 \