AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix type conversion compile errors

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1949553003

Review-Url: https://codereview.chromium.org/1949553003
This commit is contained in:
brianosman 2016-05-04 08:19:44 -07:00 committed by Commit bot
parent ae5c01d52b
commit 419ca64f0f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/vk/GrVkGpu.cpp
View File

@ -89,7 +89,7 @@ GrVkGpu::GrVkGpu(GrContext* context, const GrContextOptions& options,
fBackendContext.reset(backendCtx);
#ifdef ENABLE_VK_LAYERS
fCallback = nullptr;
fCallback = VK_NULL_HANDLE;
if (backendCtx->fExtensions & kEXT_debug_report_GrVkExtensionFlag) {
// Setup callback creation information
VkDebugReportCallbackCreateInfoEXT callbackCreateInfo;
@ -153,7 +153,7 @@ GrVkGpu::~GrVkGpu() {
#ifdef ENABLE_VK_LAYERS
if (fCallback) {
VK_CALL(DestroyDebugReportCallbackEXT(fBackendContext->fInstance, fCallback, nullptr));
fCallback = nullptr;
fCallback = VK_NULL_HANDLE;
}
#endif
}

2
tools/vulkan/VulkanTestContext.cpp
View File

@ -240,7 +240,7 @@ void VulkanTestContext::createBuffers(VkFormat format) {
GrBackendRenderTargetDesc desc;
GrVkTextureInfo info;
info.fImage = fImages[i];
info.fAlloc = nullptr;
info.fAlloc = VK_NULL_HANDLE;
info.fImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
info.fImageTiling = VK_IMAGE_TILING_OPTIMAL;
info.fFormat = format;