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

Commit a02be27f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change to using sysprop for libvulkan" into rvc-dev

parents c50b6044 bc37dd56

vulkan/libvulkan/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ cc_library_shared { 
        "hwvulkan_headers",

        "hwvulkan_headers",

        "libnativeloader-headers",

        "libnativeloader-headers",

        "vulkan_headers",

        "vulkan_headers",

        "libsurfaceflinger_headers",

    ],

    ],

    export_header_lib_headers: ["vulkan_headers"],

    export_header_lib_headers: ["vulkan_headers"],

    shared_libs: [

    shared_libs: [
@@ -100,6 +101,7 @@ cc_library_shared { 
        "libnativeloader_lazy",

        "libnativeloader_lazy",

        "libnativewindow",

        "libnativewindow",

        "android.hardware.graphics.common@1.0",

        "android.hardware.graphics.common@1.0",

        "libSurfaceFlingerProp",

    ],

    ],

    static_libs: ["libgrallocusage"],

    static_libs: ["libgrallocusage"],

}
 
}

vulkan/libvulkan/driver.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -23,9 +23,10 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <string.h>

#include <string.h>





#include <SurfaceFlingerProperties.h>

#include <android-base/properties.h>

#include <android/dlext.h>

#include <android/dlext.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>

#include <android-base/properties.h>

#include <configstore/Utils.h>

#include <configstore/Utils.h>

#include <cutils/properties.h>

#include <cutils/properties.h>

#include <graphicsenv/GraphicsEnv.h>

#include <graphicsenv/GraphicsEnv.h>
@@ -959,9 +960,7 @@ VkResult EnumerateDeviceExtensionProperties( 
        VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME,

        VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME,

        VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION});

        VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION});





    bool hdrBoardConfig =

    bool hdrBoardConfig = android::sysprop::has_HDR_display(false);

        getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(

            false);

    if (hdrBoardConfig) {

    if (hdrBoardConfig) {

        loader_extensions.push_back({VK_EXT_HDR_METADATA_EXTENSION_NAME,

        loader_extensions.push_back({VK_EXT_HDR_METADATA_EXTENSION_NAME,

                                     VK_EXT_HDR_METADATA_SPEC_VERSION});

                                     VK_EXT_HDR_METADATA_SPEC_VERSION});