Fix some issues for Linux Vulkan build
lifecycle in GrVkGpu was tagged as uninitialized before use, and err in GrVkImage as unused.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782453004
Review URL: https://codereview.chromium.org/1782453004
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index d357f32..db520fa 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -584,15 +584,9 @@
// TODO: determine what format Chrome will actually send us and turn it into a Resource
GrVkImage::Resource* imageRsrc = reinterpret_cast<GrVkImage::Resource*>(desc.fTextureHandle);
- GrGpuResource::LifeCycle lifeCycle;
- switch (ownership) {
- case kAdopt_GrWrapOwnership:
- lifeCycle = GrGpuResource::kAdopted_LifeCycle;
- break;
- case kBorrow_GrWrapOwnership:
- lifeCycle = GrGpuResource::kBorrowed_LifeCycle;
- break;
- }
+ GrGpuResource::LifeCycle lifeCycle = (kAdopt_GrWrapOwnership == ownership)
+ ? GrGpuResource::kAdopted_LifeCycle
+ : GrGpuResource::kBorrowed_LifeCycle;
GrSurfaceDesc surfDesc;
// next line relies on GrBackendTextureDesc's flags matching GrTexture's
@@ -628,15 +622,9 @@
GrVkImage::Resource* imageRsrc =
reinterpret_cast<GrVkImage::Resource*>(wrapDesc.fRenderTargetHandle);
- GrGpuResource::LifeCycle lifeCycle;
- switch (ownership) {
- case kAdopt_GrWrapOwnership:
- lifeCycle = GrGpuResource::kAdopted_LifeCycle;
- break;
- case kBorrow_GrWrapOwnership:
- lifeCycle = GrGpuResource::kBorrowed_LifeCycle;
- break;
- }
+ GrGpuResource::LifeCycle lifeCycle = (kAdopt_GrWrapOwnership == ownership)
+ ? GrGpuResource::kAdopted_LifeCycle
+ : GrGpuResource::kBorrowed_LifeCycle;
GrSurfaceDesc desc;
desc.fConfig = wrapDesc.fConfig;