Better handling of module initialization

Former-commit-id: 08d4b87a9b7cc10e672c23374306081fc9259de0
This commit is contained in:
Lynix
2013-07-31 14:17:48 +02:00
parent 48e5af6373
commit fc56553021
2 changed files with 15 additions and 10 deletions

View File

@@ -6,6 +6,7 @@
#include <Nazara/Renderer/TextureSampler.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Context.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Texture.hpp>
#include <unordered_map>
@@ -374,10 +375,14 @@ bool NzTextureSampler::Initialize()
void NzTextureSampler::Uninitialize()
{
for (const std::pair<nzUInt32, GLuint>& pair : s_samplers)
glDeleteSamplers(1, &pair.second);
if (!s_samplers.empty())
{
NzContext::EnsureContext();
for (const std::pair<nzUInt32, GLuint>& pair : s_samplers)
glDeleteSamplers(1, &pair.second);
s_samplers.clear();
s_samplers.clear();
}
}
nzUInt8 NzTextureSampler::s_defaultAnisotropyLevel = 1;