Add constant buffers alignment for data structures (16-byte boundaries)

2024-05-23 13:58:46 +02:00
parent 91aa5a0fb9
commit 206ff89587
38 changed files with 54 additions and 49 deletions
--- a/Source/Engine/Debug/DebugDraw.cpp
+++ b/Source/Engine/Debug/DebugDraw.cpp
@@ -125,7 +125,7 @@ PACK_STRUCT(struct Vertex {
    Color32 Color;
    });

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Matrix ViewProjection;
    Float2 Padding;
    float ClipPosZBias;
--- a/Source/Engine/Graphics/Config.h
+++ b/Source/Engine/Graphics/Config.h
@@ -28,6 +28,9 @@
 // Maximum amount of thread groups per dimension for compute dispatch
 #define GPU_MAX_CS_DISPATCH_THREAD_GROUPS 65535

+// Alignment of the shader data structures (16-byte boundaries) to improve memory copies efficiency.
+#define GPU_SHADER_DATA_ALIGNMENT 16
+
 // Enable/disable assertion for graphics layers
 #define GPU_ENABLE_ASSERTION 1

--- a/Source/Engine/Graphics/RenderTools.h
+++ b/Source/Engine/Graphics/RenderTools.h
@@ -2,6 +2,7 @@

 #pragma once

+#include "Config.h"
 #include "PixelFormat.h"
 #include "RenderView.h"
 #include "Engine/Scripting/ScriptingType.h"
@@ -11,7 +12,7 @@ class SkinnedModel;
 struct RenderContext;
 struct FloatR10G10B10A2;

-PACK_STRUCT(struct QuadShaderData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) QuadShaderData
    {
    Float4 Color;
    });
--- a/Source/Engine/Level/Actors/ExponentialHeightFog.cpp
+++ b/Source/Engine/Level/Actors/ExponentialHeightFog.cpp
@@ -179,7 +179,7 @@ void ExponentialHeightFog::GetExponentialHeightFogData(const RenderView& view, S
    result.VolumetricFogMaxDistance = VolumetricFogDistance;
 }

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    ShaderGBufferData GBuffer;
    ShaderExponentialHeightFogData ExponentialHeightFog;
    });
--- a/Source/Engine/Level/Actors/Sky.cpp
+++ b/Source/Engine/Level/Actors/Sky.cpp
@@ -17,7 +17,7 @@
 #include "Engine/Serialization/Serialization.h"
 #include "Engine/Level/Scene/SceneRendering.h"

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Matrix WVP;
    Float3 ViewOffset;
    float Padding;
--- a/Source/Engine/Particles/Graph/GPU/GPUParticles.cpp
+++ b/Source/Engine/Particles/Graph/GPU/GPUParticles.cpp
@@ -13,7 +13,7 @@
 #include "Engine/Graphics/Shaders/GPUShader.h"
 #include "Engine/Graphics/Shaders/GPUConstantBuffer.h"

-PACK_STRUCT(struct GPUParticlesData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) GPUParticlesData {
    Matrix ViewProjectionMatrix;
    Matrix InvViewProjectionMatrix;
    Matrix InvViewMatrix;
--- a/Source/Engine/Particles/Particles.cpp
+++ b/Source/Engine/Particles/Particles.cpp
@@ -569,7 +569,7 @@ void DrawEmitterCPU(RenderContext& renderContext, ParticleBuffer* buffer, DrawCa

 #if COMPILE_WITH_GPU_PARTICLES

-PACK_STRUCT(struct GPUParticlesSortingData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) GPUParticlesSortingData {
    Float3 ViewPosition;
    uint32 ParticleCounterOffset;
    uint32 ParticleStride;
--- a/Source/Engine/Render2D/Render2D.cpp
+++ b/Source/Engine/Render2D/Render2D.cpp
@@ -52,11 +52,11 @@
 // True if enable downscaling when rendering blur
 const bool DownsampleForBlur = false;

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Matrix ViewProjection;
    });

-PACK_STRUCT(struct BlurData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) BlurData {
    Float2 InvBufferSize;
    uint32 SampleCount;
    float Dummy0;
--- a/Source/Engine/Renderer/AmbientOcclusionPass.h
+++ b/Source/Engine/Renderer/AmbientOcclusionPass.h
@@ -19,7 +19,7 @@ class AmbientOcclusionPass : public RendererPass<AmbientOcclusionPass>
 private:

    // Packed shader constant buffer structure (this MUST match shader code)
-    PACK_STRUCT(struct ASSAOConstants {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ASSAOConstants {
        ShaderGBufferData GBuffer;

        Float2 ViewportPixelSize;
--- a/Source/Engine/Renderer/AntiAliasing/FXAA.cpp
+++ b/Source/Engine/Renderer/AntiAliasing/FXAA.cpp
@@ -7,7 +7,7 @@
 #include "Engine/Graphics/Graphics.h"
 #include "Engine/Graphics/RenderTask.h"

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    Float4 ScreenSize;
    });
--- a/Source/Engine/Renderer/AntiAliasing/SMAA.h
+++ b/Source/Engine/Renderer/AntiAliasing/SMAA.h
@@ -15,7 +15,7 @@ class SMAA : public RendererPass<SMAA>
 {
 private:

-    PACK_STRUCT(struct Data
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
        {
        Float4 RtSize;
        });
--- a/Source/Engine/Renderer/AntiAliasing/TAA.cpp
+++ b/Source/Engine/Renderer/AntiAliasing/TAA.cpp
@@ -11,7 +11,7 @@
 #include "Engine/Renderer/GBufferPass.h"
 #include "Engine/Engine/Engine.h"

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    Float2 ScreenSizeInv;
    Float2 JitterInv;
--- a/Source/Engine/Renderer/AtmospherePreCompute.cpp
+++ b/Source/Engine/Renderer/AtmospherePreCompute.cpp
@@ -61,7 +61,7 @@ protected:
    bool Run() override;
 };

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    float First;
    float AtmosphereR;
--- a/Source/Engine/Renderer/ColorGradingPass.cpp
+++ b/Source/Engine/Renderer/ColorGradingPass.cpp
@@ -8,7 +8,7 @@
 #include "Engine/Graphics/RenderTargetPool.h"
 #include "Engine/Graphics/RenderTask.h"

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Float4 ColorSaturationShadows;
    Float4 ColorContrastShadows;
    Float4 ColorGammaShadows;
--- a/Source/Engine/Renderer/Config.h
+++ b/Source/Engine/Renderer/Config.h
@@ -6,11 +6,12 @@
 #include "Engine/Core/Math/Vector2.h"
 #include "Engine/Core/Math/Vector3.h"
 #include "Engine/Core/Math/Vector4.h"
+#include "Engine/Graphics/Config.h"

 /// <summary>
 /// Structure that contains information about GBuffer for shaders.
 /// </summary>
-PACK_STRUCT(struct ShaderGBufferData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderGBufferData
    {
    Float4 ViewInfo;
    Float4 ScreenSize;
@@ -23,7 +24,7 @@ PACK_STRUCT(struct ShaderGBufferData
 /// <summary>
 /// Structure that contains information about exponential height fog for shaders.
 /// </summary>
-PACK_STRUCT(struct ShaderExponentialHeightFogData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderExponentialHeightFogData
    {
    Float3 FogInscatteringColor;
    float FogMinOpacity;
@@ -48,7 +49,7 @@ PACK_STRUCT(struct ShaderExponentialHeightFogData
 /// <summary>
 /// Structure that contains information about atmosphere fog for shaders.
 /// </summary>
-PACK_STRUCT(struct ShaderAtmosphericFogData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderAtmosphericFogData
    {
    float AtmosphericFogDensityScale;
    float AtmosphericFogSunDiscScale;
@@ -70,7 +71,7 @@ PACK_STRUCT(struct ShaderAtmosphericFogData
 /// <summary>
 /// Structure that contains information about light for shaders.
 /// </summary>
-PACK_STRUCT(struct ShaderLightData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderLightData {
    Float2 SpotAngles;
    float SourceRadius;
    float SourceLength;
@@ -89,7 +90,7 @@ PACK_STRUCT(struct ShaderLightData {
 /// <summary>
 /// Packed env probe data
 /// </summary>
-PACK_STRUCT(struct ShaderEnvProbeData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderEnvProbeData {
    Float4 Data0; // x - Position.x,  y - Position.y,  z - Position.z,  w - unused
    Float4 Data1; // x - Radius    ,  y - 1 / Radius,  z - Brightness,  w - unused
    });
--- a/Source/Engine/Renderer/DepthOfFieldPass.cpp
+++ b/Source/Engine/Renderer/DepthOfFieldPass.cpp
@@ -18,7 +18,7 @@
 #define DOF_GRID_SIZE 450
 #define DOF_DEPTH_BLUR_FORMAT PixelFormat::R16G16_Float

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Float2 ProjectionAB;
    float BokehDepthCullThreshold;
    float BokehDepthCutoff;
--- a/Source/Engine/Renderer/Editor/LightmapUVsDensity.cpp
+++ b/Source/Engine/Renderer/Editor/LightmapUVsDensity.cpp
@@ -19,7 +19,7 @@
 #include "Engine/Level/Scene/Scene.h"
 #include "Engine/Level/Actors/StaticModel.h"

-PACK_STRUCT(struct LightmapUVsDensityMaterialShaderData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) LightmapUVsDensityMaterialShaderData {
    Matrix ViewProjectionMatrix;
    Matrix WorldMatrix;
    Rectangle LightmapArea;
--- a/Source/Engine/Renderer/Editor/VertexColors.cpp
+++ b/Source/Engine/Renderer/Editor/VertexColors.cpp
@@ -12,7 +12,7 @@
 #include "Engine/Graphics/RenderTask.h"
 #include "Engine/Renderer/DrawCall.h"

-PACK_STRUCT(struct VertexColorsMaterialShaderData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) VertexColorsMaterialShaderData {
    Matrix ViewProjectionMatrix;
    Matrix WorldMatrix;
    });
--- a/Source/Engine/Renderer/EyeAdaptationPass.cpp
+++ b/Source/Engine/Renderer/EyeAdaptationPass.cpp
@@ -16,7 +16,7 @@
 #include "Engine/Engine/Engine.h"
 #include "Engine/Engine/Time.h"

-PACK_STRUCT(struct EyeAdaptationData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) EyeAdaptationData {
    float MinBrightness;
    float MaxBrightness;
    float SpeedUp;
--- a/Source/Engine/Renderer/GBufferPass.cpp
+++ b/Source/Engine/Renderer/GBufferPass.cpp
@@ -21,7 +21,7 @@
 #include "Engine/Level/Actors/Decal.h"
 #include "Engine/Engine/Engine.h"

-PACK_STRUCT(struct GBufferPassData{
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) GBufferPassData{
    ShaderGBufferData GBuffer;
    Float3 Dummy0;
    int32 ViewMode;
--- a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp
+++ b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.cpp
@@ -41,7 +41,7 @@
 #define DDGI_PROBE_UPDATE_BORDERS_GROUP_SIZE 8
 #define DDGI_PROBE_CLASSIFY_GROUP_SIZE 32

-PACK_STRUCT(struct Data0
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data0
    {
    DynamicDiffuseGlobalIlluminationPass::ConstantsData DDGI;
    GlobalSignDistanceFieldPass::ConstantsData GlobalSDF;
@@ -54,7 +54,7 @@ PACK_STRUCT(struct Data0
    Int4 ProbeScrollClears[4];
    });

-PACK_STRUCT(struct Data1
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data1
    {
    // TODO: use push constants on Vulkan or root signature data on DX12 to reduce overhead of changing single DWORD
    Float2 Padding1;
--- a/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h
+++ b/Source/Engine/Renderer/GI/DynamicDiffuseGlobalIllumination.h
@@ -13,7 +13,7 @@ class FLAXENGINE_API DynamicDiffuseGlobalIlluminationPass : public RendererPass<
 {
 public:
    // Constant buffer data for DDGI access on a GPU.
-    PACK_STRUCT(struct ConstantsData
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ConstantsData
        {
        Float4 ProbesOriginAndSpacing[4];
        Int4 ProbesScrollOffsets[4];
--- a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
+++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
@@ -42,7 +42,7 @@
 #include "Engine/Debug/DebugDraw.h"
 #endif

-PACK_STRUCT(struct Data0
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data0
    {
    Float3 ViewWorldPos;
    float ViewNearPlane;
--- a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
+++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
@@ -11,7 +11,7 @@ class FLAXENGINE_API GlobalSurfaceAtlasPass : public RendererPass<GlobalSurfaceA
 {
 public:
    // Constant buffer data for Global Surface Atlas access on a GPU.
-    PACK_STRUCT(struct ConstantsData
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ConstantsData
        {
        Float3 ViewPos;
        float Padding0;
--- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
+++ b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.cpp
@@ -38,7 +38,7 @@ static_assert(GLOBAL_SDF_RASTERIZE_MODEL_MAX_COUNT % 4 == 0, "Must be multiple o
 #include "Engine/Debug/DebugDraw.h"
 #endif

-PACK_STRUCT(struct ObjectRasterizeData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ObjectRasterizeData
    {
    Matrix3x4 WorldToVolume;
    Matrix3x4 VolumeToWorld;
@@ -50,7 +50,7 @@ PACK_STRUCT(struct ObjectRasterizeData
    float DecodeAdd;
    });

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    Float3 ViewWorldPos;
    float ViewNearPlane;
@@ -60,7 +60,7 @@ PACK_STRUCT(struct Data
    GlobalSignDistanceFieldPass::ConstantsData GlobalSDF;
    });

-PACK_STRUCT(struct ModelsRasterizeData
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ModelsRasterizeData
    {
    Int3 ChunkCoord;
    float MaxDistance;
--- a/Source/Engine/Renderer/GlobalSignDistanceFieldPass.h
+++ b/Source/Engine/Renderer/GlobalSignDistanceFieldPass.h
@@ -12,7 +12,7 @@ class FLAXENGINE_API GlobalSignDistanceFieldPass : public RendererPass<GlobalSig
 {
 public:
    // Constant buffer data for Global SDF access on a GPU.
-    PACK_STRUCT(struct ConstantsData
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ConstantsData
        {
        Float4 CascadePosDistance[4];
        Float4 CascadeVoxelSize;
--- a/Source/Engine/Renderer/HistogramPass.cpp
+++ b/Source/Engine/Renderer/HistogramPass.cpp
@@ -16,7 +16,7 @@
 #define THREADGROUP_SIZE_Y 16
 #define HISTOGRAM_SIZE 64

-PACK_STRUCT(struct HistogramData {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) HistogramData {
    uint32 InputSizeX;
    uint32 InputSizeY;
    float HistogramMul;
--- a/Source/Engine/Renderer/LightPass.cpp
+++ b/Source/Engine/Renderer/LightPass.cpp
@@ -13,12 +13,12 @@
 #include "Engine/Content/Assets/CubeTexture.h"
 #include "Engine/Content/Content.h"

-PACK_STRUCT(struct PerLight{
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) PerLight{
    ShaderLightData Light;
    Matrix WVP;
    });

-PACK_STRUCT(struct PerFrame{
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) PerFrame{
    ShaderGBufferData GBuffer;
    });

--- a/Source/Engine/Renderer/MotionBlurPass.cpp
+++ b/Source/Engine/Renderer/MotionBlurPass.cpp
@@ -17,7 +17,7 @@
 #include "Engine/Graphics/Shaders/GPUShader.h"
 #include "Engine/Engine/Time.h"

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    ShaderGBufferData GBuffer;
    Matrix CurrentVP;
    Matrix PreviousVP;
--- a/Source/Engine/Renderer/PostProcessingPass.h
+++ b/Source/Engine/Renderer/PostProcessingPass.h
@@ -15,7 +15,7 @@ class PostProcessingPass : public RendererPass<PostProcessingPass>
 {
 private:

-    PACK_STRUCT(struct Data {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
        float BloomLimit;
        float BloomThreshold;
        float BloomMagnitude;
@@ -56,7 +56,7 @@ private:
        Matrix LensFlareStarMat;
        });

-    PACK_STRUCT(struct GaussianBlurData {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) GaussianBlurData {
        Float2 Size;
        float Dummy3;
        float Dummy4;
--- a/Source/Engine/Renderer/ProbesRenderer.cpp
+++ b/Source/Engine/Renderer/ProbesRenderer.cpp
@@ -69,7 +69,7 @@ public:
    }
 };

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    Float2 Dummy0;
    int32 CubeFace;
--- a/Source/Engine/Renderer/ReflectionsPass.cpp
+++ b/Source/Engine/Renderer/ReflectionsPass.cpp
@@ -13,7 +13,7 @@
 #include "Engine/Graphics/RenderTargetPool.h"
 #include "Engine/Level/Actors/EnvironmentProbe.h"

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    ShaderEnvProbeData PData;
    Matrix WVP;
    ShaderGBufferData GBuffer;
--- a/Source/Engine/Renderer/ScreenSpaceReflectionsPass.cpp
+++ b/Source/Engine/Renderer/ScreenSpaceReflectionsPass.cpp
@@ -24,7 +24,7 @@
 #define TEXTURE1 5
 #define TEXTURE2 6

-PACK_STRUCT(struct Data
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data
    {
    ShaderGBufferData GBuffer;

--- a/Source/Engine/Renderer/ShadowsPass.cpp
+++ b/Source/Engine/Renderer/ShadowsPass.cpp
@@ -28,7 +28,7 @@
 #define NormalOffsetScaleTweak METERS_TO_UNITS(1)
 #define LocalLightNearPlane METERS_TO_UNITS(0.1f)

-PACK_STRUCT(struct Data{
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data{
    ShaderGBufferData GBuffer;
    ShaderLightData Light;
    Matrix WVP;
--- a/Source/Engine/Renderer/Utils/BitonicSort.cpp
+++ b/Source/Engine/Renderer/Utils/BitonicSort.cpp
@@ -15,7 +15,7 @@ struct Item
    uint32 Value;
 };

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Item NullItem;
    uint32 CounterOffset;
    uint32 MaxIterations;
--- a/Source/Engine/Renderer/Utils/MultiScaler.cpp
+++ b/Source/Engine/Renderer/Utils/MultiScaler.cpp
@@ -5,7 +5,7 @@
 #include "Engine/Content/Content.h"
 #include "Engine/Graphics/GPUContext.h"

-PACK_STRUCT(struct Data {
+PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
    Float2 TexelSize;
    Float2 Padding;
    });
--- a/Source/Engine/Renderer/VolumetricFogPass.h
+++ b/Source/Engine/Renderer/VolumetricFogPass.h
@@ -28,14 +28,14 @@ public:

 private:

-    PACK_STRUCT(struct SkyLightData {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) SkyLightData {
        Float3 MultiplyColor;
        float VolumetricScatteringIntensity;
        Float3 AdditiveColor;
        float Dummy0;
        });

-    PACK_STRUCT(struct Data {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) Data {
        ShaderGBufferData GBuffer;

        Float3 GlobalAlbedo;
@@ -67,7 +67,7 @@ private:
        DynamicDiffuseGlobalIlluminationPass::ConstantsData DDGI;
        });

-    PACK_STRUCT(struct PerLight {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) PerLight {
        Float2 SliceToDepth;
        int32 MinZ;
        float LocalLightScatteringIntensity;
--- a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
+++ b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
@@ -23,7 +23,7 @@

 namespace ShadowsOfMordor
 {
-    PACK_STRUCT(struct ShaderData {
+    PACK_STRUCT(struct alignas(GPU_SHADER_DATA_ALIGNMENT) ShaderData {
        Rectangle LightmapArea;
        Matrix WorldMatrix;
        Matrix ToTangentSpace;