2 files changed, 12 insertions, 0 deletions

diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc
index 0024ebe38f7..87152822fab 100644
--- a/source/blender/render/intern/engine.cc
+++ b/source/blender/render/intern/engine.cc
@@ -152,6 +152,7 @@ static void engine_depsgraph_free(RenderEngine *engine)
     /* Need GPU context since this might free GPU buffers. */
     const bool use_gpu_context = (engine->type->flag & RE_USE_GPU_CONTEXT);
     if (use_gpu_context) {
+      GPU_render_begin();
       DRW_render_context_enable(engine->re);
     }
 
@@ -160,6 +161,7 @@ static void engine_depsgraph_free(RenderEngine *engine)
 
     if (use_gpu_context) {
       DRW_render_context_disable(engine->re);
+      GPU_render_end();
     }
   }
 }
@@ -756,6 +758,7 @@ static void engine_depsgraph_init(RenderEngine *engine, ViewLayer *view_layer)
     /* Need GPU context since this might free GPU buffers. */
     const bool use_gpu_context = (engine->type->flag & RE_USE_GPU_CONTEXT) && reuse_depsgraph;
     if (use_gpu_context) {
+      GPU_render_begin();
       DRW_render_context_enable(engine->re);
     }
 
@@ -763,6 +766,7 @@ static void engine_depsgraph_init(RenderEngine *engine, ViewLayer *view_layer)
 
     if (use_gpu_context) {
       DRW_render_context_disable(engine->re);
+      GPU_render_end();
     }
   }
   else {
@@ -935,6 +939,7 @@ static void engine_render_view_layer(Render *re,
   if (use_engine) {
     const bool use_gpu_context = (engine->type->flag & RE_USE_GPU_CONTEXT);
     if (use_gpu_context) {
+      GPU_render_begin();
       DRW_render_context_enable(engine->re);
     }
 
@@ -950,6 +955,7 @@ static void engine_render_view_layer(Render *re,
 
     if (use_gpu_context) {
       DRW_render_context_disable(engine->re);
+      GPU_render_end();
     }
   }
 
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 3cac9063b8e..3c9849591f4 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -2391,6 +2391,9 @@ void RE_RenderAnim(Render *re,
 
 void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
 {
+  /* Ensure within GPU render boundary. */
+  GPU_render_begin();
+
   Object *camera;
   int winx, winy;
 
@@ -2411,6 +2414,9 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
     RE_engine_free(re->engine);
     re->engine = nullptr;
   }
+
+  /* Close GPU render boundary. */
+  GPU_render_end();
 }
 
 /* NOTE: repeated win/disprect calc... solve that nicer, also in compo. */