sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lynix 2016-08-10 14:08:20 +02:00
parent f130b84176
commit 3438d0105a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Graphics/DeferredRenderQueue.cpp
View File

@ -239,6 +239,8 @@ namespace Nz
std::vector<Matrix4f>& instances = it2->second.instances; std::vector<Matrix4f>& instances = it2->second.instances;
instances.push_back(transformMatrix); instances.push_back(transformMatrix);
materialEntry.maxInstanceCount = std::max(materialEntry.maxInstanceCount, instances.size());
} }
} }

4
src/Nazara/Renderer/RenderTexture.cpp
View File

@ -588,7 +588,7 @@ namespace Nz
std::memcpy(&m_impl->colorTargets[0], targets, targetCount*sizeof(UInt8)); std::memcpy(&m_impl->colorTargets[0], targets, targetCount*sizeof(UInt8));
m_impl->userDefinedTargets = true; m_impl->userDefinedTargets = true;
InvalidateDrawBuffers(); InvalidateTargets();
} }
void RenderTexture::SetColorTargets(const std::initializer_list<UInt8>& targets) const void RenderTexture::SetColorTargets(const std::initializer_list<UInt8>& targets) const
@ -614,7 +614,7 @@ namespace Nz
*ptr++ = index; *ptr++ = index;
m_impl->userDefinedTargets = true; m_impl->userDefinedTargets = true;
InvalidateDrawBuffers(); InvalidateTargets();
} }
void RenderTexture::Unlock() const void RenderTexture::Unlock() const