From 8f77c62adc8a1810c74d3cc2f2eb8f95206f44c9 Mon Sep 17 00:00:00 2001
From: Steven Perron <stevenperron@google.com>
Date: Fri, 3 Dec 2021 13:08:54 -0500
Subject: [PATCH] Fix writing immutable combined sampler

When writing the immutable samples so they can be read as a normal
sampler, it is written to the start of the descriptor.  However, if the
sampler is part of a combined image&sampler, it needs to be written
after the image descriptor.  This change will add that offset when
necessary.
---
 icd/api/include/vk_descriptor_set.h |  3 ++-
 icd/api/vk_descriptor_pool.cpp      |  2 +-
 icd/api/vk_descriptor_set.cpp       | 19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/icd/api/include/vk_descriptor_set.h b/icd/api/include/vk_descriptor_set.h
index 78d6cae9..30b1b56d 100644
--- a/icd/api/include/vk_descriptor_set.h
+++ b/icd/api/include/vk_descriptor_set.h
@@ -125,7 +125,8 @@ class DescriptorSet final : public NonDispatchable<VkDescriptorSet, DescriptorSe
         DescriptorAddr*             pBaseAddrs,
         void*                       pAllocHandle);
 
-    void WriteImmutableSamplers();
+    void WriteImmutableSamplers(
+        uint32_t imageDescSizeInBytes);
 
     void Reset();
 
diff --git a/icd/api/vk_descriptor_pool.cpp b/icd/api/vk_descriptor_pool.cpp
index 30652c00..bd8a8356 100644
--- a/icd/api/vk_descriptor_pool.cpp
+++ b/icd/api/vk_descriptor_pool.cpp
@@ -349,7 +349,7 @@ VkResult DescriptorPool::AllocDescriptorSets(
                         pSetAllocHandle);
                     if (m_pDevice->MustWriteImmutableSamplers())
                     {
-                        pSet->WriteImmutableSamplers();
+                        pSet->WriteImmutableSamplers(m_pDevice->GetProperties().descriptorSizes.imageView);
                     }
                 }
                 else
diff --git a/icd/api/vk_descriptor_set.cpp b/icd/api/vk_descriptor_set.cpp
index 81de6a4c..7a1808f3 100644
--- a/icd/api/vk_descriptor_set.cpp
+++ b/icd/api/vk_descriptor_set.cpp
@@ -92,7 +92,8 @@ void DescriptorSet<numPalDevices>::Reassign(
 // =====================================================================================================================
 // Writes the immutable samplers in the layout to memory.
 template <uint32_t numPalDevices>
-void DescriptorSet<numPalDevices>::WriteImmutableSamplers()
+void DescriptorSet<numPalDevices>::WriteImmutableSamplers(
+    uint32_t imageDescSizeInBytes)
 {
     for (uint32_t deviceIdx = 0; deviceIdx < numPalDevices; deviceIdx++)
     {
@@ -104,6 +105,10 @@ void DescriptorSet<numPalDevices>::WriteImmutableSamplers()
             {
                 uint32_t* pSamplerDesc = Layout()->Info().imm.pImmutableSamplerData + bindingInfo.imm.dwOffset;
                 uint32_t* pDestAddr = StaticCpuAddress(deviceIdx) + Layout()->GetDstStaOffset(bindingInfo, 0);
+                if (bindingInfo.info.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER)
+                {
+                    pDestAddr += (imageDescSizeInBytes / sizeof(uint32_t));
+                }
                 memcpy(pDestAddr, pSamplerDesc, sizeof(uint32)*bindingInfo.imm.dwSize);
             }
         }
@@ -1070,7 +1075,8 @@ template
 void DescriptorSet<1>::Reset();
 
 template
-void DescriptorSet<1>::WriteImmutableSamplers();
+void DescriptorSet<1>::WriteImmutableSamplers(
+        uint32_t imageDescSizeInBytes);
 
 template
 DescriptorSet<2>::DescriptorSet(uint32_t heapIndex);
@@ -1086,7 +1092,8 @@ template
 void DescriptorSet<2>::Reset();
 
 template
-void DescriptorSet<2>::WriteImmutableSamplers();
+void DescriptorSet<2>::WriteImmutableSamplers(
+        uint32_t imageDescSizeInBytes);
 
 template
 DescriptorSet<3>::DescriptorSet(uint32_t heapIndex);
@@ -1102,7 +1109,8 @@ template
 void DescriptorSet<3>::Reset();
 
 template
-void DescriptorSet<3>::WriteImmutableSamplers();
+void DescriptorSet<3>::WriteImmutableSamplers(
+        uint32_t imageDescSizeInBytes);
 
 template
 DescriptorSet<4>::DescriptorSet(uint32_t heapIndex);
@@ -1118,6 +1126,7 @@ template
 void DescriptorSet<4>::Reset();
 
 template
-void DescriptorSet<4>::WriteImmutableSamplers();
+void DescriptorSet<4>::WriteImmutableSamplers(
+        uint32_t imageDescSizeInBytes);
 
 } // namespace vk