Ticket #478: gl-resize.patch

xpra/client/gl/gl_window_backing_base.py

@@ -276 +276 @@
     def init(self, ww, wh, bw, bh):
         #re-init gl projection with new dimensions
         #(see gl_init)
+        self.render_size = ww, wh
         if self.size!=(bw, bh):
-            self.gl_setup = False
-            self.size = bw, bh
-        self.render_size = ww, wh
+            if self.gl_setup:
+                self.resize(bw, bh)
+            else:
+                self.size = bw, bh
 
     def gl_marker(self, *msg):
         log(*msg)
@@ -459 +461 @@
             b.destroy()
         self.glconfig = None
 
+    def resize(self, bw, bh):
+        ow, oh = self.size
+        self.size = bw, bh
+        log("resize%s", (bw, bh))
+        context = self.gl_context()
+        if not context:
+            log.warn("Warning: cannot resize, no OpenGL context!")
+            return
+        with context:
+            bw, bh = self.size
+            self.set_rgb_paint_state()
+
+            glViewport(0, 0, bw, bh)
+            glMatrixMode(GL_PROJECTION)
+            glLoadIdentity()
+            glOrtho(0.0, bw, bh, 0.0, -1.0, 1.0)
+            glMatrixMode(GL_MODELVIEW)
+
+            # Define new empty tmp FBO using the new size:
+            glBindTexture(GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO])
+            glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BASE_LEVEL, 0)
+            glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAX_LEVEL, 0)
+            glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, self.texture_pixel_format, bw, bh, 0, self.texture_pixel_format, GL_UNSIGNED_BYTE, None)
+            glBindFramebuffer(GL_FRAMEBUFFER, self.tmp_fbo)
+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO], 0)
+            glClear(GL_COLOR_BUFFER_BIT)
+
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, self.offscreen_fbo)
+            glBindTexture(GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_FBO])
+            glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_FBO], 0)
+            glReadBuffer(GL_COLOR_ATTACHMENT0)
+
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, self.tmp_fbo)
+            glBindTexture(GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO])
+            glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO], 0)
+            glDrawBuffer(GL_COLOR_ATTACHMENT1)
+
+            w = min(ow, bw)
+            h = min(oh, bh)
+            shrinkh = oh-h
+            growh = bh-h
+            #copy current fbo:
+            glBlitFramebuffer(0, h, w, 0,
+                              0, h, w, 0,
+                              GL_COLOR_BUFFER_BIT, GL_NEAREST)
+            log.info("glBlitFramebuffer%s", (0, oh, w, shrinkh,
+                              0, bh, w, growh))
+
+            #now swap references to tmp and offscreen so tmp becomes the new offscreen:
+            tmp = self.offscreen_fbo
+            self.offscreen_fbo = self.tmp_fbo
+            self.tmp_fbo = tmp
+            tmp = self.textures[TEX_FBO]
+            self.textures[TEX_FBO] = self.textures[TEX_TMP_FBO]
+            self.textures[TEX_TMP_FBO] = tmp
+
+            #and again, new empty fbo:
+            glBindTexture(GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO])
+            glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BASE_LEVEL, 0)
+            glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAX_LEVEL, 0)
+            glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, self.texture_pixel_format, bw, bh, 0, self.texture_pixel_format, GL_UNSIGNED_BYTE, None)
+            glBindFramebuffer(GL_FRAMEBUFFER, self.tmp_fbo)
+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_TMP_FBO], 0)
+            glClear(GL_COLOR_BUFFER_BIT)
+
+            #restore normal paint state:
+            glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, self.textures[TEX_FBO], 0)
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, self.offscreen_fbo)
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, self.offscreen_fbo)
+            glBindFramebuffer(GL_FRAMEBUFFER, self.offscreen_fbo)
+
+            self.unset_rgb_paint_state()
+            self.paint_box("scroll", True, 0, bw, w, growh)
+            self.present_fbo(0, 0, bw, bh)
+
     def paint_scroll(self, x, y, w, h, scroll_data, options, callbacks):
         flush = options.intget("flush", 0)
         self.idle_add(self.do_scroll_paints, scroll_data, flush)