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

Update other graphics apis to match missing vertex shader inputs merging

Browse Source
This commit is contained in:
Wojtek Figat
2025-01-04 10:55:55 +01:00
parent ea5cb5d83a
commit 4f42fb2302
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Graphics/Shaders/GPUVertexLayout.cpp
View File

@@ -208,12 +208,10 @@ GPUVertexLayout* GPUVertexLayout::Get(const Span<GPUVertexLayout*>& layouts)
return result;
}
GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, const GPUVertexLayout* reference)
GPUVertexLayout* GPUVertexLayout::Merge(GPUVertexLayout* base, GPUVertexLayout* reference)
{
if (!reference || !base || base == reference)
return base;
GPUVertexLayout* result = base;
if (base && reference)
GPUVertexLayout* result = base ? base : reference;
if (base && reference && base != reference)
{
bool anyMissing = false;
const Elements& baseElements = base->GetElements();