From 3438d0105a40807c357aafab4ef30f3f79c4fdcd 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: 72a1a2d31d0d0b54b596e2ed0e007acc0e206a37 [formerly 87ebaf36f4df323e992833e94ec9628cd5ebc1ad] [formerly 6be175c77c11ffa090106fdc20cf0eaf6dd33159 [formerly d721d20ae53ba078e856c6b968205ebaf71e0151]] Former-commit-id: ab55c5ced8dec7cdc65da9a706bcae1c01a7d0d4 [formerly fd71d68a674972c542387d3342f4c3d61fc4e4da] Former-commit-id: dc7cfadb8b7df4c78919af939380289a6b167354 --- 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