From 6581005c3c5cb4338b79d92b3ff445ece6a11dfd Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Tue, 8 Mar 2022 11:34:55 -0800 Subject: [PATCH] gpu: use hwui vulkan backend The Vulkan backend is the intended production configuration and what we shipped gs101 with. Also checked remaining gpu configuration and minimized textual differences from the gs101 device.mk for easier comparison. Bug: 223406172 Test: Launcher, YouTube video playback, Pixel Camera preview & shot Change-Id: I85e3c34ef424f7cef97bcfb6f5a10746fc0b9804 --- device.mk | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/device.mk b/device.mk index c928b3c8..2a23dbb0 100644 --- a/device.mk +++ b/device.mk @@ -153,50 +153,52 @@ endif USE_SWIFTSHADER := false # HWUI -TARGET_USES_VULKAN = false +TARGET_USES_VULKAN = true -PRODUCT_SOONG_NAMESPACES += vendor/arm/mali/valhall +PRODUCT_SOONG_NAMESPACES += \ + vendor/arm/mali/valhall $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) +include device/google/gs101/neuralnetwork/neuralnetwork.mk + PRODUCT_PACKAGES += \ - csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ - libGLES_mali \ - vulkan.mali \ - libOpenCL \ - libgpudataproducer \ + csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ + libGLES_mali \ + vulkan.mali \ + libOpenCL \ + libgpudataproducer \ PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.vulkan=mali - -include device/google/gs101/neuralnetwork/neuralnetwork.mk + ro.hardware.vulkan=mali ifeq ($(USE_SWIFTSHADER),true) PRODUCT_PACKAGES += \ - libGLESv1_CM_swiftshader \ - libEGL_swiftshader \ - libGLESv2_swiftshader + libGLESv1_CM_swiftshader \ + libEGL_swiftshader \ + libGLESv2_swiftshader endif 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.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ - frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.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.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.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ + frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.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 ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = swiftshader + ro.hardware.egl = swiftshader else PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali + ro.hardware.egl = mali endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.opengles.version=196610 \ - debug.renderengine.backend=skiaglthreaded \ - graphics.gpu.profiler.support=true \ + ro.opengles.version=196610 \ + graphics.gpu.profiler.support=true \ + debug.renderengine.backend=skiaglthreaded \ # GRAPHICS - GPU (end) # ####################