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

Correct scissor set in FrameBuffer and DepthBuffer.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-04-03 20:58:45 +06:00
parent f76de6450a
commit 5bad15abd9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DepthBuffer.cpp
View File

@ -171,7 +171,7 @@ CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
return m_pDepthBufferTexture; return m_pDepthBufferTexture;
if (m_resolved) if (m_resolved)
return m_pResolveDepthBufferTexture; return m_pResolveDepthBufferTexture;
glDisable(GL_SCISSOR_TEST); glScissor(0, 0, m_pDepthBufferTexture->realWidth, m_pDepthBufferTexture->realHeight);
glBindFramebuffer(GL_READ_FRAMEBUFFER, _pBuffer->m_FBO); glBindFramebuffer(GL_READ_FRAMEBUFFER, _pBuffer->m_FBO);
glReadBuffer(GL_COLOR_ATTACHMENT0); glReadBuffer(GL_COLOR_ATTACHMENT0);
GLuint attachment = GL_COLOR_ATTACHMENT0; GLuint attachment = GL_COLOR_ATTACHMENT0;
@ -187,8 +187,8 @@ CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
); );
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _pBuffer->m_FBO); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _pBuffer->m_FBO);
glEnable(GL_SCISSOR_TEST);
m_resolved = true; m_resolved = true;
gDP.changed |= CHANGED_SCISSOR;
return m_pResolveDepthBufferTexture; return m_pResolveDepthBufferTexture;
} }

6
FrameBuffer.cpp
View File

@ -226,7 +226,7 @@ void FrameBuffer::resolveMultisampledTexture()
{ {
if (m_resolved) if (m_resolved)
return; return;
glDisable(GL_SCISSOR_TEST); glScissor(0, 0, m_pTexture->realWidth, m_pTexture->realHeight);
glBindFramebuffer(GL_READ_FRAMEBUFFER, m_FBO); glBindFramebuffer(GL_READ_FRAMEBUFFER, m_FBO);
glReadBuffer(GL_COLOR_ATTACHMENT0); glReadBuffer(GL_COLOR_ATTACHMENT0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolveFBO); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolveFBO);
@ -237,7 +237,7 @@ void FrameBuffer::resolveMultisampledTexture()
); );
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, frameBufferList().getCurrent()->m_FBO); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, frameBufferList().getCurrent()->m_FBO);
glEnable(GL_SCISSOR_TEST); gDP.changed |= CHANGED_SCISSOR;
m_resolved = true; m_resolved = true;
} }
@ -854,7 +854,7 @@ void FrameBufferToRDRAM::CopyToRDRAM(u32 _address) {
free(pixelData); free(pixelData);
#endif #endif
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glEnable(GL_SCISSOR_TEST); gDP.changed |= CHANGED_SCISSOR;
} }
#endif // GLES2 #endif // GLES2