mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
Disable resolveMultisampledTexture() for system without GL_MULTISAMPLING_SUPPORT
This commit is contained in:
parent
4e821c0763
commit
7cbca30197
|
@ -176,6 +176,7 @@ void DepthBuffer::initDepthBufferTexture(FrameBuffer * _pBuffer)
|
||||||
|
|
||||||
CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
|
CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
|
||||||
{
|
{
|
||||||
|
#ifdef GL_MULTISAMPLING_SUPPORT
|
||||||
if (config.video.multisampling == 0)
|
if (config.video.multisampling == 0)
|
||||||
return m_pDepthBufferTexture;
|
return m_pDepthBufferTexture;
|
||||||
if (m_resolved)
|
if (m_resolved)
|
||||||
|
@ -199,6 +200,9 @@ CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
|
||||||
m_resolved = true;
|
m_resolved = true;
|
||||||
gDP.changed |= CHANGED_SCISSOR;
|
gDP.changed |= CHANGED_SCISSOR;
|
||||||
return m_pResolveDepthBufferTexture;
|
return m_pResolveDepthBufferTexture;
|
||||||
|
#else
|
||||||
|
return m_pDepthBufferTexture;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void DepthBuffer::activateDepthBufferTexture(FrameBuffer * _pBuffer)
|
void DepthBuffer::activateDepthBufferTexture(FrameBuffer * _pBuffer)
|
||||||
|
|
|
@ -317,6 +317,7 @@ bool FrameBuffer::isValid() const
|
||||||
|
|
||||||
void FrameBuffer::resolveMultisampledTexture()
|
void FrameBuffer::resolveMultisampledTexture()
|
||||||
{
|
{
|
||||||
|
#ifdef GL_MULTISAMPLING_SUPPORT
|
||||||
if (m_resolved)
|
if (m_resolved)
|
||||||
return;
|
return;
|
||||||
glScissor(0, 0, m_pTexture->realWidth, m_pTexture->realHeight);
|
glScissor(0, 0, m_pTexture->realWidth, m_pTexture->realHeight);
|
||||||
|
@ -332,6 +333,7 @@ void FrameBuffer::resolveMultisampledTexture()
|
||||||
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, frameBufferList().getCurrent()->m_FBO);
|
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, frameBufferList().getCurrent()->m_FBO);
|
||||||
gDP.changed |= CHANGED_SCISSOR;
|
gDP.changed |= CHANGED_SCISSOR;
|
||||||
m_resolved = true;
|
m_resolved = true;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
CachedTexture * FrameBuffer::getTexture()
|
CachedTexture * FrameBuffer::getTexture()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user