From 3471ebf5af0cc82c45df7e2c60ef40a4d5de27f5 Mon Sep 17 00:00:00 2001
From: Greg Daniel <egdaniel@google.com>
Date: Mon, 18 May 2026 14:53:08 +0000
Subject: [PATCH] Null out VkShaderModule handles when destroying them.

Bug: https://issues.chromium.org/issues/513972075
Change-Id: Ieeaf92c87343aa328479302d9cffeb36b5b0c8e4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1238159
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
---
 src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp
index 5012b5ec1c..9f4bc32a2a 100644
--- a/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp
+++ b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp
@@ -151,6 +151,7 @@ int GrVkPipelineStateBuilder::loadShadersFromCache(SkReadBuffer* cached,
             if (outShaderModules[i]) {
                 GR_VK_CALL(fGpu->vkInterface(),
                            DestroyShaderModule(fGpu->device(), outShaderModules[i], nullptr));
+                outShaderModules[i] = VK_NULL_HANDLE;
             }
         }
         return 0;
@@ -282,6 +283,7 @@ GrVkPipelineState* GrVkPipelineStateBuilder::finalize(const GrProgramDesc& desc,
                 if (shaderModules[i]) {
                     GR_VK_CALL(fGpu->vkInterface(), DestroyShaderModule(fGpu->device(),
                                                                         shaderModules[i], nullptr));
+                    shaderModules[i] = VK_NULL_HANDLE;
                 }
             }
             return nullptr;
@@ -357,6 +359,7 @@ GrVkPipelineState* GrVkPipelineStateBuilder::finalize(const GrProgramDesc& desc,
         if (shaderModules[i]) {
             GR_VK_CALL(fGpu->vkInterface(), DestroyShaderModule(fGpu->device(), shaderModules[i],
                                                                 nullptr));
+            shaderModules[i] = VK_NULL_HANDLE;
         }
     }
 
-- 
2.43.0

