From 6196bb31fe51b806b732416d976423a1ee59bd8f Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Tue, 22 Mar 2022 13:20:07 +0100
Subject: [PATCH] Post merge fixes

---
 Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp | 2 +-
 Source/Engine/ShadersCompilation/ShaderCompiler.cpp           | 3 ++-
 Source/Engine/Tools/ModelTool/ModelTool.Build.cs              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp b/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp
index 966e20b75..790319507 100644
--- a/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp
+++ b/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp
@@ -406,7 +406,7 @@ bool ShaderCompilerDX::CompileShader(ShaderFunctionMeta& meta, WritePermutationD
                 for (UINT shift = 0; shift < resDesc.BindCount; shift++)
                 {
                     bindings.UsedUAsMask |= 1 << (resDesc.BindPoint + shift);
-                    header.SrDimensions[resDesc.BindPoint + shift] = (byte)resDesc.Dimension; // D3D_SRV_DIMENSION matches D3D12_UAV_DIMENSION
+                    header.UaDimensions[resDesc.BindPoint + shift] = (byte)resDesc.Dimension; // D3D_SRV_DIMENSION matches D3D12_UAV_DIMENSION
                 }
                 break;
             }
diff --git a/Source/Engine/ShadersCompilation/ShaderCompiler.cpp b/Source/Engine/ShadersCompilation/ShaderCompiler.cpp
index 832301b61..eba91df76 100644
--- a/Source/Engine/ShadersCompilation/ShaderCompiler.cpp
+++ b/Source/Engine/ShadersCompilation/ShaderCompiler.cpp
@@ -9,6 +9,7 @@
 #include "Engine/Platform/File.h"
 #include "Engine/Platform/FileSystem.h"
 #include "Engine/Graphics/RenderTools.h"
+#include "Engine/Graphics/Shaders/GPUShader.h"
 #include "Engine/Threading/Threading.h"
 #include "Engine/Profiler/ProfilerCPU.h"
 #include "Engine/Serialization/MemoryWriteStream.h"
@@ -80,7 +81,7 @@ bool ShaderCompiler::Compile(ShaderCompilationContext* context)
         _constantBuffers.Add({ meta->CB[i].Slot, false, 0 });
 
     // [Output] Version number
-    output->WriteInt32(8);
+    output->WriteInt32(GPU_SHADER_CACHE_VERSION);
 
     // [Output] Additional data start
     const int32 additionalDataStartPos = output->GetPosition();
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.Build.cs b/Source/Engine/Tools/ModelTool/ModelTool.Build.cs
index aade19933..f65db0243 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.Build.cs
+++ b/Source/Engine/Tools/ModelTool/ModelTool.Build.cs
@@ -67,6 +67,7 @@ public class ModelTool : EngineModule
 
         options.PrivateDependencies.Add("meshoptimizer");
         options.PrivateDependencies.Add("MikkTSpace");
+        options.PrivateDependencies.Add("Physics");
     }
 
     /// <inheritdoc />