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

Fix new compiler DXC changes

Browse Source
This commit is contained in:
Wojtek Figat
2025-11-18 05:42:02 -08:00
parent 1e4f96486f
commit c437daf9be
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
View File

@@ -630,7 +630,9 @@ void GPUContextDX12::flushPS()
LOG(Error, "Missing Vertex Layout (not assigned to GPUBuffer). Vertex Shader won't read valid data resulting incorrect visuals."); LOG(Error, "Missing Vertex Layout (not assigned to GPUBuffer). Vertex Shader won't read valid data resulting incorrect visuals.");
} }
#endif #endif
_commandList->SetPipelineState(_currentState->GetState(_rtDepth, _rtCount, _rtHandles, _vertexLayout)); ID3D12PipelineState* pso = _currentState->GetState(_rtDepth, _rtCount, _rtHandles, _vertexLayout);
ASSERT(pso);
_commandList->SetPipelineState(pso);
if (_primitiveTopology != _currentState->PrimitiveTopology) if (_primitiveTopology != _currentState->PrimitiveTopology)
{ {
_primitiveTopology = _currentState->PrimitiveTopology; _primitiveTopology = _currentState->PrimitiveTopology;

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

@@ -222,7 +222,7 @@ bool ShaderCompilerDX::CompileShader(ShaderFunctionMeta& meta, WritePermutationD
argsFull.Add(TEXT("-D")); argsFull.Add(TEXT("-D"));
argsFull.Add(*d); argsFull.Add(*d);
} }
GetArgs(argsFull); GetArgs(meta, argsFull);
// Compile // Compile
ComPtr<IDxcResult> results; ComPtr<IDxcResult> results;

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

@@ -32,7 +32,7 @@ public:
~ShaderCompilerDX(); ~ShaderCompilerDX();
protected: protected:
virtual void GetArgs(Array<const Char*, InlinedAllocation<250>> args) virtual void GetArgs(ShaderFunctionMeta& meta, Array<const Char*, InlinedAllocation<250>>& args)
{ {
} }