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

Graphics: Deferred Shading is back! 

Former-commit-id: 7548832de10b4240ff026d2884b9f3db6d48e212 [formerly cb255ac8457c43bd516f8e360527fef7ca898641] [formerly cb64b1420c6b75fdae8b1918b9f1dfbb257a9c75 [formerly 79174685d3af9dd158235728726a05332c5f18ac]]
Former-commit-id: aa6beaab51e7f18a587f8a7342e3f92a2af44998 [formerly e0e3c03197aad458a0b36ccfb6138b2e37451131]
Former-commit-id: a9c0837e8e81e5a5c1ddfcaf39a881c2480b1c3a
This commit is contained in:
Lynix 2016-08-10 14:08:20 +02:00
parent 957b6162d6
commit 2c076ae1c5
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;
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));
m_impl->userDefinedTargets = true;
InvalidateDrawBuffers();
InvalidateTargets();
}
void RenderTexture::SetColorTargets(const std::initializer_list<UInt8>& targets) const
@ -614,7 +614,7 @@ namespace Nz
*ptr++ = index;
m_impl->userDefinedTargets = true;
InvalidateDrawBuffers();
InvalidateTargets();
}
void RenderTexture::Unlock() const