Fix restoring state after creating new render target

src/renderer/renderer.cpp

@@ -848,18 +848,9 @@ struct Renderer::Impl {
     }
 
     if (state.mRenderTargetTexture != mLastCommittedState.mRenderTargetTexture) {
-      base::Extents framebufferSize;
-      if (state.mRenderTargetTexture != 0) {
-        const auto iData = mRenderTargetDict.find(state.mRenderTargetTexture);
-        assert(iData != mRenderTargetDict.end());
-
-        glBindFramebuffer(GL_FRAMEBUFFER, iData->second.mFbo);
-        framebufferSize = iData->second.mSize;
-      } else {
-        glBindFramebuffer(GL_FRAMEBUFFER, 0);
-        framebufferSize = mWindowSize;
-      }
+      const auto framebufferSize = currentFramebufferSize();
 
+      commitRenderTarget(state);
       glViewport(0, 0, framebufferSize.width, framebufferSize.height);
       commitClipRect(state, framebufferSize);
       commitVertexAttributeFormat();
@@ -903,6 +894,17 @@ struct Renderer::Impl {
   }
 
 
+  void commitRenderTarget(const State& state) {
+    if (state.mRenderTargetTexture != 0) {
+      const auto iData = mRenderTargetDict.find(state.mRenderTargetTexture);
+      assert(iData != mRenderTargetDict.end());
+      glBindFramebuffer(GL_FRAMEBUFFER, iData->second.mFbo);
+    } else {
+      glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    }
+  }
+
+
   void commitClipRect(
     const State& state,
     const base::Extents& framebufferSize
@@ -1031,8 +1033,8 @@ struct Renderer::Impl {
       textureHandle,
       0);
 
-    mStateChanged = true;
     glBindTexture(GL_TEXTURE_2D, mLastUsedTexture);
+    commitRenderTarget(mLastCommittedState);
 
     mRenderTargetDict.insert({textureHandle, {{width, height}, fboHandle}});