Switch Pixel 6 GLES system driver to ANGLE

Test: make and flash
Bug: 218321565
Change-Id: I9fc2c9eaddb09d7b054e128a6070554b70af2233
This commit is contained in:
Tim Van Patten 2022-01-26 17:48:17 -07:00 committed by TreeHugger Robot
parent 3a19eb3da0
commit 22fe58d389
2 changed files with 17 additions and 0 deletions

View file

@ -116,6 +116,9 @@ 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 := false
# This should be the same value as USE_ANGLE in device.mk
BOARD_USES_ANGLE := true
# Gralloc4 # Gralloc4
ifeq ($(BOARD_USES_SWIFTSHADER),true) ifeq ($(BOARD_USES_SWIFTSHADER),true)
$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true) $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)

View file

@ -180,6 +180,9 @@ endif
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := false USE_SWIFTSHADER := false
# Must match BOARD_USES_ANGLE in BoardConfig.mk
USE_ANGLE := true
# HWUI # HWUI
TARGET_USES_VULKAN = true TARGET_USES_VULKAN = true
@ -209,6 +212,13 @@ PRODUCT_PACKAGES += \
libGLESv2_swiftshader libGLESv2_swiftshader
endif endif
ifeq ($(USE_ANGLE),true)
PRODUCT_PACKAGES += \
libEGL_angle \
libGLESv1_CM_angle \
libGLESv2_angle
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 \
@ -220,6 +230,10 @@ PRODUCT_COPY_FILES += \
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader ro.hardware.egl = swiftshader
else ifeq ($(USE_ANGLE),true)
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = angle \
ro.hardware.egl_legacy = mali
else else
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali ro.hardware.egl = mali