SL-18745 Fix for LLVertexBuffer assertion on shutdown.
parent
0186707937
commit
dc4f65a2ec
|
|
@ -918,3 +918,26 @@ void LLReflectionMapManager::initReflectionMaps()
|
|||
mVertexBuffer = buff;
|
||||
}
|
||||
}
|
||||
|
||||
void LLReflectionMapManager::cleanup()
|
||||
{
|
||||
mVertexBuffer = nullptr;
|
||||
mRenderTarget.release();
|
||||
|
||||
mMipChain.clear();
|
||||
|
||||
mTexture = nullptr;
|
||||
mIrradianceMaps = nullptr;
|
||||
|
||||
mProbes.clear();
|
||||
mKillList.clear();
|
||||
mCreateList.clear();
|
||||
|
||||
mReflectionMaps.clear();
|
||||
mUpdatingFace = 0;
|
||||
|
||||
mDefaultProbe = nullptr;
|
||||
|
||||
glDeleteBuffers(1, &mUBO);
|
||||
mUBO = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,6 +58,9 @@ public:
|
|||
// allocate an environment map of the given resolution
|
||||
LLReflectionMapManager();
|
||||
|
||||
// release any GL state
|
||||
void cleanup();
|
||||
|
||||
// maintain reflection probes
|
||||
void update();
|
||||
|
||||
|
|
|
|||
|
|
@ -659,6 +659,8 @@ void LLPipeline::cleanup()
|
|||
mDeferredVB = NULL;
|
||||
|
||||
mCubeVB = NULL;
|
||||
|
||||
mReflectionMapManager.cleanup();
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
|
|
|
|||
Loading…
Reference in New Issue