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

Commit 610fbb3a authored by Ben Wagner's avatar Ben Wagner Committed by Android (Google) Code Review
Browse files

Merge "Use FatVector instead of SkAutoMalloc in VulkanManager."

parents 7c31e6aa eec27d51

libs/hwui/renderthread/VulkanManager.cpp

+5 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "Properties.h"

#include "RenderThread.h"

#include "renderstate/RenderState.h"

#include "utils/FatVector.h"



#include <GrContext.h>

#include <GrTypes.h>
@@ -381,10 +382,9 @@ bool VulkanManager::createSwapchain(VulkanSurface* surface) { 
        return false;

    }



    SkAutoMalloc surfaceFormatAlloc(surfaceFormatCount * sizeof(VkSurfaceFormatKHR));

    VkSurfaceFormatKHR* surfaceFormats = (VkSurfaceFormatKHR*)surfaceFormatAlloc.get();

    FatVector<VkSurfaceFormatKHR, 4> surfaceFormats(surfaceFormatCount);

    res = mGetPhysicalDeviceSurfaceFormatsKHR(mBackendContext->fPhysicalDevice, surface->mVkSurface,

            &surfaceFormatCount, surfaceFormats);

            &surfaceFormatCount, surfaceFormats.data());

    if (VK_SUCCESS != res) {

        return false;

    }
@@ -396,10 +396,9 @@ bool VulkanManager::createSwapchain(VulkanSurface* surface) { 
        return false;

    }



    SkAutoMalloc presentModeAlloc(presentModeCount * sizeof(VkPresentModeKHR));

    VkPresentModeKHR* presentModes = (VkPresentModeKHR*)presentModeAlloc.get();

    FatVector<VkPresentModeKHR, VK_PRESENT_MODE_RANGE_SIZE_KHR> presentModes(presentModeCount);

    res = mGetPhysicalDeviceSurfacePresentModesKHR(mBackendContext->fPhysicalDevice,

            surface->mVkSurface, &presentModeCount, presentModes);

            surface->mVkSurface, &presentModeCount, presentModes.data());

    if (VK_SUCCESS != res) {

        return false;

    }