diff options
author | 2016-03-02 12:08:22 -0800 | |
---|---|---|
committer | 2016-03-02 12:08:22 -0800 | |
commit | 9846ef263324cc77c90ee2ba029313727f9d2814 (patch) | |
tree | b01f54336e57b9404ddbf8185133e080f16871b9 /src/gpu/vk/GrVkProgram.cpp | |
parent | 73c4e64f4bb90059cf822dac9eaf30e1c38bec77 (diff) |
Replace some nullptrs with VK_NULL_HANDLE
Also ensures GrVkRenderPass.h ends with a LF.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1758003002
NOTRY=true
Review URL: https://codereview.chromium.org/1758003002
Diffstat (limited to 'src/gpu/vk/GrVkProgram.cpp')
-rw-r--r-- | src/gpu/vk/GrVkProgram.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/vk/GrVkProgram.cpp b/src/gpu/vk/GrVkProgram.cpp index 00f01b70c8..0e1e201c2b 100644 --- a/src/gpu/vk/GrVkProgram.cpp +++ b/src/gpu/vk/GrVkProgram.cpp @@ -100,18 +100,18 @@ void GrVkProgram::freeGPUResources(const GrVkGpu* gpu) { GR_VK_CALL(gpu->vkInterface(), DestroyPipelineLayout(gpu->device(), fPipelineLayout, nullptr)); - fPipelineLayout = nullptr; + fPipelineLayout = VK_NULL_HANDLE; } if (fDSLayout[0]) { GR_VK_CALL(gpu->vkInterface(), DestroyDescriptorSetLayout(gpu->device(), fDSLayout[0], nullptr)); - fDSLayout[0] = nullptr; + fDSLayout[0] = VK_NULL_HANDLE; } if (fDSLayout[1]) { GR_VK_CALL(gpu->vkInterface(), DestroyDescriptorSetLayout(gpu->device(), fDSLayout[1], nullptr)); - fDSLayout[1] = nullptr; + fDSLayout[1] = VK_NULL_HANDLE; } if (fVertexUniformBuffer) { @@ -129,9 +129,9 @@ void GrVkProgram::abandonGPUResources() { fPipeline = nullptr; fDescriptorPool->unrefAndAbandon(); fDescriptorPool = nullptr; - fPipelineLayout = nullptr; - fDSLayout[0] = nullptr; - fDSLayout[1] = nullptr; + fPipelineLayout = VK_NULL_HANDLE; + fDSLayout[0] = VK_NULL_HANDLE; + fDSLayout[1] = VK_NULL_HANDLE; fVertexUniformBuffer->abandon(); fFragmentUniformBuffer->abandon(); |