Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Unified Diff: src/gpu/vk/GrVkProgram.cpp

Issue 1758003002: Replace some nullptrs with VK_NULL_HANDLE (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Oh, I see. It's one of those. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/vk/GrVkPipeline.cpp ('k') | src/gpu/vk/GrVkRenderPass.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/vk/GrVkProgram.cpp
diff --git a/src/gpu/vk/GrVkProgram.cpp b/src/gpu/vk/GrVkProgram.cpp
index 00f01b70c80b2aeeb7612e6e493bf76f72868113..0e1e201c2b5bd6405f61dddbe436f6e0f7df5bde 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();
« no previous file with comments | « src/gpu/vk/GrVkPipeline.cpp ('k') | src/gpu/vk/GrVkRenderPass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698