From ec5d1ae39e1dc84300bf58d7e07375bceae960e5 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 10 Dec 2019 19:39:29 +0000
Subject: [PATCH] Don't set immutable samplers for initial state SAMPLER
 descriptor writes

---
 renderdoc/driver/vulkan/vk_initstate.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp
index d4e7ed1c9..095e7a56f 100644
--- a/renderdoc/driver/vulkan/vk_initstate.cpp
+++ b/renderdoc/driver/vulkan/vk_initstate.cpp
@@ -840,7 +840,9 @@ bool WrappedVulkan::Serialise_InitialState(SerialiserType &ser, ResourceId id,
                 dstImage[d].imageLayout = src[d].imageInfo.imageLayout;
               }
 
-              if(immutableSamplers)
+              // if we're not updating a SAMPLER descriptor fill in immutable samplers so that our
+              // validity checking doesn't have to look them up.
+              if(immutableSamplers && writes[bind].descriptorType != VK_DESCRIPTOR_TYPE_SAMPLER)
               {
                 for(uint32_t d = 0; d < descriptorCount; d++)
                   dstImage[d].sampler =