diff options
| author |  jvanverth <jvanverth@google.com> | 2016-03-02 12:08:22 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-02 12:08:22 -0800 |
| commit | 9846ef263324cc77c90ee2ba029313727f9d2814 (patch) | |
| tree | b01f54336e57b9404ddbf8185133e080f16871b9 | |
| 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
| -rw-r--r-- | src/gpu/vk/GrVkImage.h | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipeline.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkProgram.cpp | 12 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkRenderPass.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/vk/GrVkImage.h index 3467a61f2b..eb0f7bf4fe 100644 --- a/src/gpu/vk/GrVkImage.h +++ b/src/gpu/vk/GrVkImage.h @@ -29,7 +29,7 @@ public: VkDeviceMemory fAlloc; Flags fFlags; - Resource() : INHERITED(), fImage(nullptr), fAlloc(nullptr), fFlags(kNo_Flags) {} + Resource() : INHERITED(), fImage(VK_NULL_HANDLE), fAlloc(VK_NULL_HANDLE), fFlags(kNo_Flags) {} Resource(VkImage image, VkDeviceMemory alloc, Flags flags) : fImage(image), fAlloc(alloc), fFlags(flags) {} diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp index 8c05de5fdc..becebac269 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/vk/GrVkPipeline.cpp @@ -495,7 +495,7 @@ GrVkPipeline* GrVkPipeline::Create(GrVkGpu* gpu, const GrPipeline& pipeline, VkPipeline vkPipeline; VkResult err = GR_VK_CALL(gpu->vkInterface(), CreateGraphicsPipelines(gpu->device(), - nullptr, 1, + VK_NULL_HANDLE, 1, &pipelineCreateInfo, nullptr, &vkPipeline)); if (err) { 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(); diff --git a/src/gpu/vk/GrVkRenderPass.h b/src/gpu/vk/GrVkRenderPass.h index d460741d5e..2f7e287542 100644 --- a/src/gpu/vk/GrVkRenderPass.h +++ b/src/gpu/vk/GrVkRenderPass.h @@ -19,7 +19,7 @@ class GrVkRenderTarget; class GrVkRenderPass : public GrVkResource { public: - GrVkRenderPass() : INHERITED(), fRenderPass(nullptr) {} + GrVkRenderPass() : INHERITED(), fRenderPass(VK_NULL_HANDLE) {} void initSimple(const GrVkGpu* gpu, const GrVkRenderTarget& target); struct AttachmentsDescriptor { @@ -87,4 +87,4 @@ private: GR_MAKE_BITFIELD_OPS(GrVkRenderPass::AttachmentFlags); -#endif
\ No newline at end of file +#endif |