Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d165a566 authored by Trevor Black's avatar Trevor Black Committed by Automerger Merge Worker
Browse files

Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135



Change-Id: Ia818cd811660c3d4dcbb8777a94d2bbcee9e225e
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a4e842b 3f598fad

core/java/android/os/GraphicsEnvironment.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,8 @@ public class GraphicsEnvironment { 




    private static final int VULKAN_1_0 = 0x00400000;

    private static final int VULKAN_1_0 = 0x00400000;

    private static final int VULKAN_1_1 = 0x00401000;

    private static final int VULKAN_1_1 = 0x00401000;

    private static final int VULKAN_1_2 = 0x00402000;

    private static final int VULKAN_1_3 = 0x00403000;





    // Values for UPDATABLE_DRIVER_ALL_APPS

    // Values for UPDATABLE_DRIVER_ALL_APPS

    // 0: Default (Invalid values fallback to default as well)

    // 0: Default (Invalid values fallback to default as well)
@@ -213,6 +215,14 @@ public class GraphicsEnvironment { 
    private int getVulkanVersion(PackageManager pm) {

    private int getVulkanVersion(PackageManager pm) {

        // PackageManager doesn't have an API to retrieve the version of a specific feature, and we

        // PackageManager doesn't have an API to retrieve the version of a specific feature, and we

        // need to avoid retrieving all system features here and looping through them.

        // need to avoid retrieving all system features here and looping through them.

        if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_3)) {

            return VULKAN_1_3;

        }



        if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_2)) {

            return VULKAN_1_2;

        }



        if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_1)) {

        if (pm.hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION, VULKAN_1_1)) {

            return VULKAN_1_1;

            return VULKAN_1_1;

        }

        }