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

Commit e405240d authored by Yi Kong's avatar Yi Kong Committed by Android (Google) Code Review
Browse files

Merge "[vulkan] Modernize codebase by replacing NULL with nullptr"

parents 213fee8d bcbc73aa

vulkan/libvulkan/driver.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -984,7 +984,7 @@ VkResult CreateInstance(const VkInstanceCreateInfo* pCreateInfo, 
    uint32_t icd_api_version;

    uint32_t icd_api_version;

    PFN_vkEnumerateInstanceVersion pfn_enumerate_instance_version =

    PFN_vkEnumerateInstanceVersion pfn_enumerate_instance_version =

        reinterpret_cast<PFN_vkEnumerateInstanceVersion>(

        reinterpret_cast<PFN_vkEnumerateInstanceVersion>(

            Hal::Device().GetInstanceProcAddr(NULL,

            Hal::Device().GetInstanceProcAddr(nullptr,

                                              "vkEnumerateInstanceVersion"));

                                              "vkEnumerateInstanceVersion"));

    if (!pfn_enumerate_instance_version) {

    if (!pfn_enumerate_instance_version) {

        icd_api_version = VK_API_VERSION_1_0;

        icd_api_version = VK_API_VERSION_1_0;

vulkan/libvulkan/swapchain.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -335,15 +335,15 @@ uint32_t get_num_ready_timings(Swapchain& swapchain) { 
            swapchain.surface.window.get(), ti.native_frame_id_,

            swapchain.surface.window.get(), ti.native_frame_id_,

            &desired_present_time, &render_complete_time,

            &desired_present_time, &render_complete_time,

            &composition_latch_time,

            &composition_latch_time,

            NULL,  //&first_composition_start_time,

            nullptr,  //&first_composition_start_time,

            NULL,  //&last_composition_start_time,

            nullptr,  //&last_composition_start_time,

            NULL,  //&composition_finish_time,

            nullptr,  //&composition_finish_time,

            // TODO(ianelliott): Maybe ask if this one is

            // TODO(ianelliott): Maybe ask if this one is

            // supported, at startup time (since it may not be

            // supported, at startup time (since it may not be

            // supported):

            // supported):

            &actual_present_time,

            &actual_present_time,

            NULL,  //&dequeue_ready_time,

            nullptr,  //&dequeue_ready_time,

            NULL /*&reads_done_time*/);

            nullptr /*&reads_done_time*/);





        if (ret != android::NO_ERROR) {

        if (ret != android::NO_ERROR) {

            continue;

            continue;