Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use FatVector instead of SkAutoMalloc in VulkanManager."

Browse Source
This commit is contained in:
Ben Wagner
2017-01-12 18:41:48 +00:00
committed by Android (Google) Code Review
parent 7c31e6aa23 eec27d51d2
commit 610fbb3afd
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/hwui/renderthread/VulkanManager.cpp
View File

@@ -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;
}