Merge branch 'blender-v3.1-release'

1 files changed, 10 insertions, 2 deletions

diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
index d910153e912..fd4a87bc544 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -183,7 +183,9 @@ void GPU_viewport_bind(GPUViewport *viewport, int view, const rcti *rect)
   viewport->active_view = view;
 }
 
-void GPU_viewport_bind_from_offscreen(GPUViewport *viewport, struct GPUOffScreen *ofs)
+void GPU_viewport_bind_from_offscreen(GPUViewport *viewport,
+                                      struct GPUOffScreen *ofs,
+                                      bool is_xr_surface)
 {
   GPUTexture *color, *depth;
   GPUFrameBuffer *fb;
@@ -192,7 +194,13 @@ void GPU_viewport_bind_from_offscreen(GPUViewport *viewport, struct GPUOffScreen
 
   GPU_offscreen_viewport_data_get(ofs, &fb, &color, &depth);
 
-  gpu_viewport_textures_free(viewport);
+  /* XR surfaces will already check for texture size changes and free if necessary (see
+   * #wm_xr_session_surface_offscreen_ensure()), so don't free here as it has a significant
+   * performance impact (leads to texture re-creation in #gpu_viewport_textures_create() every VR
+   * drawing iteration).*/
+  if (!is_xr_surface) {
+    gpu_viewport_textures_free(viewport);
+  }
 
   /* This is the only texture we can share. */
   viewport->depth_tx = depth;