Ensure the proper default framebuffer is bound when activating a Rend…

…erWindow. Fixes #1471.
SFML · Oct 1, 2018 · 8554d21 · 8554d21
1 parent 5e10e1f
commit 8554d21
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp
@@ -177,6 +177,13 @@ class SFML_GRAPHICS_API RenderWindow : public Window, public RenderTarget
     ///
     ////////////////////////////////////////////////////////////
     virtual void onResize();
+
+private:
+
+    ////////////////////////////////////////////////////////////
+    // Member data
+    ////////////////////////////////////////////////////////////
+    unsigned int m_defaultFrameBuffer; ///< Framebuffer to bind when targeting this window
 };
 
 } // namespace sf

diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp
@@ -34,22 +34,25 @@
 namespace sf
 {
 ////////////////////////////////////////////////////////////
-RenderWindow::RenderWindow()
+RenderWindow::RenderWindow() :
+m_defaultFrameBuffer(0)
 {
     // Nothing to do
 }
 
 
 ////////////////////////////////////////////////////////////
-RenderWindow::RenderWindow(VideoMode mode, const String& title, Uint32 style, const ContextSettings& settings)
+RenderWindow::RenderWindow(VideoMode mode, const String& title, Uint32 style, const ContextSettings& settings) :
+m_defaultFrameBuffer(0)
 {
     // Don't call the base class constructor because it contains virtual function calls
     create(mode, title, style, settings);
 }
 
 
 ////////////////////////////////////////////////////////////
-RenderWindow::RenderWindow(WindowHandle handle, const ContextSettings& settings)
+RenderWindow::RenderWindow(WindowHandle handle, const ContextSettings& settings) :
+m_defaultFrameBuffer(0)
 {
     // Don't call the base class constructor because it contains virtual function calls
     create(handle, settings);
@@ -83,7 +86,7 @@ bool RenderWindow::setActive(bool active)
     // try to draw to the default framebuffer of the RenderWindow
     if (active && result && priv::RenderTextureImplFBO::isAvailable())
     {
-        priv::RenderTextureImplFBO::unbind();
+        glCheck(GLEXT_glBindFramebuffer(GLEXT_GL_FRAMEBUFFER, m_defaultFrameBuffer));
 
         return true;
     }
@@ -108,6 +111,13 @@ Image RenderWindow::capture() const
 ////////////////////////////////////////////////////////////
 void RenderWindow::onCreate()
 {
+    if (priv::RenderTextureImplFBO::isAvailable())
+    {
+        // Retrieve the framebuffer ID we have to bind when targeting the window for rendering
+        // We assume that this window's context is still active at this point
+        glCheck(glGetIntegerv(GLEXT_GL_FRAMEBUFFER_BINDING, reinterpret_cast<GLint*>(&m_defaultFrameBuffer)));
+    }
+
     // Just initialize the render target part
     RenderTarget::initialize();
 }