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

Commit b01aaa01 authored by Greg Daniel's avatar Greg Daniel Committed by Android (Google) Code Review
Browse files

Merge "Initialize pointer members in VulkanManager to null"

parents 51f29ce4 74ea2015

libs/hwui/renderthread/VulkanManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ void VulkanManager::swapBuffers(VulkanSurface* surface) { 
        mDeviceWaitIdle(mBackendContext->fDevice);

    }



    SkASSERT(surface->mBackbuffers);

    VulkanSurface::BackbufferInfo* backbuffer =

            surface->mBackbuffers + surface->mCurrentBackbufferIndex;

    GrVkImageInfo* imageInfo;
@@ -683,6 +684,7 @@ void VulkanManager::swapBuffers(VulkanSurface* surface) { 
}



int VulkanManager::getAge(VulkanSurface* surface) {

    SkASSERT(surface->mBackbuffers);

    VulkanSurface::BackbufferInfo* backbuffer =

            surface->mBackbuffers + surface->mCurrentBackbufferIndex;

    if (mSwapBehavior == SwapBehavior::Discard ||

libs/hwui/renderthread/VulkanManager.h

+2 −2
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ private: 
    VkSurfaceKHR mVkSurface = VK_NULL_HANDLE;

    VkSwapchainKHR mSwapchain = VK_NULL_HANDLE;



    BackbufferInfo* mBackbuffers;

    BackbufferInfo* mBackbuffers = nullptr;

    uint32_t mCurrentBackbufferIndex;



    uint32_t mImageCount;

    VkImage* mImages;

    VkImage* mImages = nullptr;

    ImageInfo* mImageInfos;

    uint16_t mCurrentTime = 0;

};