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

The OpenGL wrapper now handles context change

Browse Source 
Fixed some bugs
Thanks to Raakz


Former-commit-id: f156ba7aa3307cccd83c9c02987dadad02cd8185
This commit is contained in:
Lynix
2013-06-21 01:28:11 +02:00
parent cca920e597
commit 00c2e824d1
7 changed files with 208 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Nazara/Renderer/Context.cpp
View File

@@ -22,8 +22,8 @@
namespace
{
thread_local const NzContext* currentContext = nullptr;
thread_local const NzContext* threadContext = nullptr;
thread_local NzContext* currentContext = nullptr;
thread_local NzContext* threadContext = nullptr;
std::vector<NzContext*> contexts;
@@ -153,7 +153,7 @@ bool NzContext::Create(const NzContextParameters& parameters)
return false;
}
if (!m_impl->Activate())
if (!SetActive(true))
{
NazaraError("Failed to activate context");
@@ -186,9 +186,13 @@ void NzContext::Destroy()
if (m_impl)
{
NotifyDestroy();
NzOpenGL::OnContextDestruction(this);
if (currentContext == this)
{
NzContextImpl::Desactivate();
currentContext = nullptr;
}
m_impl->Destroy();
delete m_impl;
@@ -219,7 +223,7 @@ bool NzContext::IsActive() const
return currentContext == this;
}
bool NzContext::SetActive(bool active) const
bool NzContext::SetActive(bool active)
{
#ifdef NAZARA_RENDERER_SAFE
if (!m_impl)
@@ -248,6 +252,8 @@ bool NzContext::SetActive(bool active) const
currentContext = nullptr;
}
NzOpenGL::OnContextChange(currentContext);
return true;
}
@@ -300,17 +306,17 @@ bool NzContext::EnsureContext()
return true;
}
const NzContext* NzContext::GetCurrent()
NzContext* NzContext::GetCurrent()
{
return currentContext;
}
const NzContext* NzContext::GetReference()
NzContext* NzContext::GetReference()
{
return s_reference;
}
const NzContext* NzContext::GetThreadContext()
NzContext* NzContext::GetThreadContext()
{
EnsureContext();