From 021ddffdea9c9616580d0a3f3b30dcb075da3abf Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 10 Aug 2016 14:08:20 +0200 Subject: [PATCH] Graphics: Deferred Shading is back! Former-commit-id: b231aa4a5c13be870e334ab7b780317b3fb5e94e [formerly f155bbf9fab223b7f6a931f70361ddde63ef5d46] [formerly 002dcb36444c752d9cdbaf70b255008073a8670f [formerly b37e872dcca19c3607e318f2032f7842a7698d6d]] Former-commit-id: eee04dd3b14e7b1049e1662156de19683e5c2b14 [formerly ccd0956ed19b806581237aef58416e8338544875] Former-commit-id: 09c603760da3c4edc512e3fd311f2702a2ebe180 --- src/Nazara/Graphics/DeferredRenderQueue.cpp | 2 ++ src/Nazara/Renderer/RenderTexture.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Graphics/DeferredRenderQueue.cpp b/src/Nazara/Graphics/DeferredRenderQueue.cpp index 8623904a6..7d214b217 100644 --- a/src/Nazara/Graphics/DeferredRenderQueue.cpp +++ b/src/Nazara/Graphics/DeferredRenderQueue.cpp @@ -239,6 +239,8 @@ namespace Nz std::vector& instances = it2->second.instances; instances.push_back(transformMatrix); + + materialEntry.maxInstanceCount = std::max(materialEntry.maxInstanceCount, instances.size()); } } diff --git a/src/Nazara/Renderer/RenderTexture.cpp b/src/Nazara/Renderer/RenderTexture.cpp index c6e78df86..647b8ff91 100644 --- a/src/Nazara/Renderer/RenderTexture.cpp +++ b/src/Nazara/Renderer/RenderTexture.cpp @@ -588,7 +588,7 @@ namespace Nz std::memcpy(&m_impl->colorTargets[0], targets, targetCount*sizeof(UInt8)); m_impl->userDefinedTargets = true; - InvalidateDrawBuffers(); + InvalidateTargets(); } void RenderTexture::SetColorTargets(const std::initializer_list& targets) const @@ -614,7 +614,7 @@ namespace Nz *ptr++ = index; m_impl->userDefinedTargets = true; - InvalidateDrawBuffers(); + InvalidateTargets(); } void RenderTexture::Unlock() const