Fix a couple more issues with pointer alignment in shader resource caches

Author: TheMostDiligent

Graphics/GraphicsEngineD3D11/src/ShaderResourceCacheD3D11.cpp

@@ -218,6 +218,7 @@ void ShaderResourceCacheD3D11::Initialize(const D3D11ShaderResourceCounters&
             ALLOCATE(MemAllocator, "Shader resource cache data buffer", Uint8, BufferSize),
             STDDeleter<Uint8, IMemoryAllocator>(MemAllocator) //
         };
+        VERIFY((reinterpret_cast<size_t>(m_pResourceData.get()) % MaxAlignment) == 0, "Resource cache buffer is not properly aligned");
         memset(m_pResourceData.get(), 0, BufferSize);
     }
 

Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp

@@ -85,9 +85,6 @@ ShaderResourceCacheD3D12::MemoryRequirements ShaderResourceCacheD3D12::GetMemory
     MemReqs.TotalResources += NumRootViews;
     MemReqs.TotalResources += NumRootConsts;
 
-    static_assert(sizeof(RootTable) % sizeof(void*) == 0, "sizeof(RootTable) is not aligned by the sizeof(void*)");
-    static_assert(sizeof(Resource) % sizeof(void*) == 0, "sizeof(Resource) is not aligned by the sizeof(void*)");
-
     MemReqs.NumTables = NumRootTables + NumRootViews + NumRootConsts;
 
     MemReqs.TotalInlineConstantValues = 0;
@@ -134,6 +131,8 @@ size_t ShaderResourceCacheD3D12::AllocateMemory(IMemoryAllocator& MemAllocator,
             ALLOCATE_RAW(MemAllocator, "Memory for shader resource cache data", MemorySize),
             STDDeleter<void, IMemoryAllocator>(MemAllocator) //
         };
+        VERIFY((reinterpret_cast<size_t>(m_pMemory.get()) % std::max(alignof(RootTable), std::max(alignof(Resource), alignof(DescriptorHeapAllocation)))) == 0,
+               "Resource cache buffer is not properly aligned");
 
 #ifdef DILIGENT_DEBUG
         m_DbgMemoryEnd = static_cast<Uint8*>(m_pMemory.get()) + MemorySize;

Graphics/GraphicsEngineOpenGL/src/ShaderResourceCacheGL.cpp

@@ -39,14 +39,15 @@ size_t ShaderResourceCacheGL::GetRequiredMemorySize(const TResourceCount& ResCou
 {
     static_assert(std::is_same<TResourceCount, PipelineResourceSignatureGLImpl::TBindings>::value,
                   "ShaderResourceCacheGL::TResourceCount must be the same type as PipelineResourceSignatureGLImpl::TBindings");
+
+    size_t MemSize = 0;
     // clang-format off
-    size_t MemSize =
-                AlignUp(sizeof(CachedUB)           * ResCount[BINDING_RANGE_UNIFORM_BUFFER], alignof(CachedResourceView)) +
-                AlignUp(sizeof(CachedResourceView) * ResCount[BINDING_RANGE_TEXTURE],        alignof(CachedResourceView)) +
-                AlignUp(sizeof(CachedResourceView) * ResCount[BINDING_RANGE_IMAGE],          alignof(CachedSSBO))         +
-                AlignUp(sizeof(CachedSSBO)         * ResCount[BINDING_RANGE_STORAGE_BUFFER], alignof(Uint32))             +
-                TotalInlineConstants * sizeof(Uint32);
+    MemSize = AlignUp(MemSize + sizeof(CachedUB)           * ResCount[BINDING_RANGE_UNIFORM_BUFFER], alignof(CachedResourceView));
+    MemSize = AlignUp(MemSize + sizeof(CachedResourceView) * ResCount[BINDING_RANGE_TEXTURE],        alignof(CachedResourceView));
+    MemSize = AlignUp(MemSize + sizeof(CachedResourceView) * ResCount[BINDING_RANGE_IMAGE],          alignof(CachedSSBO));
+    MemSize = AlignUp(MemSize + sizeof(CachedSSBO)         * ResCount[BINDING_RANGE_STORAGE_BUFFER], alignof(Uint32));
     // clang-format on
+    MemSize += TotalInlineConstants * sizeof(Uint32);
 
     VERIFY(MemSize < InvalidResourceOffset, "Memory size exceed the maximum allowed size.");
     return MemSize;
@@ -96,6 +97,7 @@ void ShaderResourceCacheGL::Initialize(const InitAttribs& Attribs)
             ALLOCATE(Attribs.MemAllocator, "Shader resource cache data buffer", Uint8, BufferSize),
             STDDeleter<Uint8, IMemoryAllocator>(Attribs.MemAllocator) //
         };
+        VERIFY((reinterpret_cast<size_t>(m_pResourceData.get()) % std::max(alignof(CachedUB), std::max(alignof(CachedResourceView), alignof(CachedSSBO)))) == 0, "Resource cache buffer is not properly aligned");
         memset(m_pResourceData.get(), 0, BufferSize);
     }
 
@@ -315,7 +317,7 @@ void ShaderResourceCacheGL::BindResources(GLContextState&              GLState,
     {
         const CachedSSBO& SSBO = GetConstSSBO(ssbo);
         if (!SSBO.pBufferView)
-            return;
+            continue;
 
         const BufferViewGLImpl* pBufferViewGL = SSBO.pBufferView.ConstPtr();
         const BufferViewDesc&   ViewDesc      = pBufferViewGL->GetDesc();

Graphics/GraphicsEngineVulkan/src/ShaderResourceCacheVk.cpp

@@ -92,6 +92,7 @@ void ShaderResourceCacheVk::InitializeSets(IMemoryAllocator& MemAllocator,
             ALLOCATE_RAW(MemAllocator, "Memory for shader resource cache data", MemorySize),
             STDDeleter<void, IMemoryAllocator>(MemAllocator) //
         };
+        VERIFY((reinterpret_cast<size_t>(m_pMemory.get()) % std::max(alignof(DescriptorSet), alignof(Resource))) == 0, "Resource cache buffer is not properly aligned");
         memset(m_pMemory.get(), 0, MemorySize);
 
         Resource* pCurrResPtr = GetFirstResourcePtr();

Graphics/GraphicsEngineWebGPU/include/ShaderResourceCacheWebGPU.hpp

@@ -200,7 +200,7 @@ class ShaderResourceCacheWebGPU : public ShaderResourceCacheBase
 #ifdef DILIGENT_DEBUG
     const Resource* GetFirstResourcePtr() const
     {
-        return reinterpret_cast<const Resource*>(reinterpret_cast<const BindGroup*>(m_pMemory.get()) + m_NumBindGroups);
+        return AlignUp(reinterpret_cast<const Resource*>(static_cast<const BindGroup*>(m_pMemory.get()) + m_NumBindGroups), alignof(Resource));
     }
 #endif
     BindGroup* GetFirstBindGroupPtr()