Merge remote-tracking branch 'origin/master' into gi

2022-04-21 12:57:08 +02:00
parent ca935f4f08 3c841b1be1
commit cad9bad950
78 changed files with 604 additions and 311 deletions
--- a/Source/Engine/Renderer/RenderList.cpp
+++ b/Source/Engine/Renderer/RenderList.cpp
@@ -554,7 +554,7 @@ bool CanUseInstancing(DrawPass pass)
    return pass == DrawPass::GBuffer || pass == DrawPass::Depth;
 }

-void RenderList::ExecuteDrawCalls(const RenderContext& renderContext, DrawCallsList& list)
+void RenderList::ExecuteDrawCalls(const RenderContext& renderContext, DrawCallsList& list, GPUTextureView* input)
 {
    if (list.IsEmpty())
        return;
@@ -626,6 +626,7 @@ DRAW:

    // Execute draw calls
    MaterialBase::BindParameters bindParams(context, renderContext);
+    bindParams.Input = input;
    if (useInstancing)
    {
        int32 instanceBufferOffset = 0;