GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post merge fixes

Browse Source
This commit is contained in:
Wojciech Figat
2022-03-22 13:20:07 +01:00
parent 92f5377f70
commit 6196bb31fe
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.cpp
View File

@@ -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;
}

3
Source/Engine/ShadersCompilation/ShaderCompiler.cpp
View File

@@ -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();

1
Source/Engine/Tools/ModelTool/ModelTool.Build.cs
View File

@@ -67,6 +67,7 @@ public class ModelTool : EngineModule
options.PrivateDependencies.Add("meshoptimizer");
options.PrivateDependencies.Add("MikkTSpace");
options.PrivateDependencies.Add("Physics");
}
/// <inheritdoc />