mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Fixed RenderTarget tracking not being notified to update its active target when an FBO RenderTexture is display()ed. Fixes #2630
This commit is contained in:
parent
c0061797e3
commit
fe778028a2
@ -158,9 +158,22 @@ bool RenderTexture::setActive(bool active)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
void RenderTexture::display()
|
void RenderTexture::display()
|
||||||
{
|
{
|
||||||
// Update the target texture
|
if (m_impl)
|
||||||
if (m_impl && (priv::RenderTextureImplFBO::isAvailable() || setActive(true)))
|
|
||||||
{
|
{
|
||||||
|
if (priv::RenderTextureImplFBO::isAvailable())
|
||||||
|
{
|
||||||
|
// Perform a RenderTarget-only activation if we are using FBOs
|
||||||
|
if (!RenderTarget::setActive())
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Perform a full activation if we are not using FBOs
|
||||||
|
if (!setActive())
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the target texture
|
||||||
m_impl->updateTexture(m_texture.m_texture);
|
m_impl->updateTexture(m_texture.m_texture);
|
||||||
m_texture.m_pixelsFlipped = true;
|
m_texture.m_pixelsFlipped = true;
|
||||||
m_texture.invalidateMipmap();
|
m_texture.invalidateMipmap();
|
||||||
|
Loading…
Reference in New Issue
Block a user