MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix frame buffer textures delete.

Browse Source
This commit is contained in:
Sergey Lipskiy 2013-11-18 10:30:20 +07:00
parent bc8eced7bd
commit da3d18d7d8
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FrameBuffer.cpp
View File

@ -242,6 +242,7 @@ void FrameBuffer_Destroy()
{
while (frameBuffer.bottom)
FrameBuffer_RemoveBottom();
frameBuffer.top = frameBuffer.bottom = frameBuffer.current = NULL;
g_fbToRDRAM.Destroy();
g_dbToRDRAM.Destroy();
g_RDRAMtoFB.Destroy();
@ -659,8 +660,11 @@ void FrameBufferToRDRAM::Init()
void FrameBufferToRDRAM::Destroy() {
ogl_glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
ogl_glDeleteFramebuffers(1, &m_FBO);
m_FBO = 0;
TextureCache_Remove( m_pTexture );
m_pTexture = NULL;
glDeleteBuffers(2, m_aPBO);
m_aPBO[0] = m_aPBO[1] = 0;
}
void FrameBufferToRDRAM::CopyToRDRAM( u32 address, bool bSync ) {
@ -772,8 +776,11 @@ void DepthBufferToRDRAM::Init()
void DepthBufferToRDRAM::Destroy() {
ogl_glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
ogl_glDeleteFramebuffers(1, &m_FBO);
m_FBO = 0;
TextureCache_Remove( m_pTexture );
m_pTexture = NULL;
glDeleteBuffers(2, m_aPBO);
m_aPBO[0] = m_aPBO[1] = 0;
}
void DepthBufferToRDRAM::CopyToRDRAM( u32 address) {
@ -857,7 +864,9 @@ void RDRAMtoFrameBuffer::Init()
void RDRAMtoFrameBuffer::Destroy()
{
TextureCache_Remove( m_pTexture );
m_pTexture = NULL;
glDeleteBuffers(1, &m_PBO);
m_PBO = 0;
}
void RDRAMtoFrameBuffer::CopyFromRDRAM( u32 _address, bool _bUseAlpha)

2
Textures.cpp
View File

@ -350,6 +350,8 @@ void TextureCache_RemoveBottom()
void TextureCache_Remove( CachedTexture *texture )
{
if (texture == NULL)
return;
if ((texture == cache.bottom) &&
(texture == cache.top))
{