3 files changed, 29 insertions, 5 deletions

diff --git a/src/ui/paint.c b/src/ui/paint.c
index 85e75f15..a55670e9 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -1,5 +1,7 @@
 #include "paint.h"
 
+#include <SDL_version.h>
+
 iLocalDef SDL_Renderer *renderer_Paint_(const iPaint *d) {
     iAssert(d->dst);
     return d->dst->render;
@@ -12,6 +14,18 @@ static void setColor_Paint_(const iPaint *d, int color) {
 
 void init_Paint(iPaint *d) {
     d->dst = get_Window();
+    d->oldTarget = NULL;
+}
+
+void beginTarget_Paint(iPaint *d, SDL_Texture *target) {
+    SDL_Renderer *rend = renderer_Paint_(d);
+    d->oldTarget = SDL_GetRenderTarget(rend);
+    SDL_SetRenderTarget(rend, target);
+}
+
+void endTarget_Paint(iPaint *d) {
+    SDL_SetRenderTarget(renderer_Paint_(d), d->oldTarget);
+    d->oldTarget = NULL;
 }
 
 void setClip_Paint(iPaint *d, iRect rect) {
@@ -19,8 +33,12 @@ void setClip_Paint(iPaint *d, iRect rect) {
 }
 
 void unsetClip_Paint(iPaint *d) {
+#if SDL_VERSION_ATLEAST(2, 0, 12)
+    SDL_RenderSetClipRect(renderer_Paint_(d), NULL);
+#else
     const SDL_Rect winRect = { 0, 0, d->dst->root->rect.size.x, d->dst->root->rect.size.y };
     SDL_RenderSetClipRect(renderer_Paint_(d), &winRect);
+#endif
 }
 
 void drawRect_Paint(const iPaint *d, iRect rect, int color) {
diff --git a/src/ui/paint.h b/src/ui/paint.h
index 90c5f504..aafc7496 100644
--- a/src/ui/paint.h
+++ b/src/ui/paint.h
@@ -9,12 +9,16 @@ iDeclareType(Paint)
 
 struct Impl_Paint {
     iWindow *dst;
+    SDL_Texture *oldTarget;
 };
 
-void    init_Paint      (iPaint *);
+void    init_Paint          (iPaint *);
 
-void    setClip_Paint   (iPaint *, iRect rect);
-void    unsetClip_Paint (iPaint *);
+void    beginTarget_Paint   (iPaint *, SDL_Texture *target);
+void    endTarget_Paint     (iPaint *);
+
+void    setClip_Paint       (iPaint *, iRect rect);
+void    unsetClip_Paint     (iPaint *);
 
 void    drawRect_Paint          (const iPaint *, iRect rect, int color);
 void    drawRectThickness_Paint (const iPaint *, iRect rect, int thickness, int color);
diff --git a/src/ui/text.c b/src/ui/text.c
index f947c4df..52af34bb 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -306,10 +306,11 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
     }
     /* Determine placement in the glyph cache texture, advancing in rows. */
     glRect->pos = assignCachePos_Text_(txt, glRect->size);
+    SDL_Texture *oldTarget = SDL_GetRenderTarget(render);
     SDL_SetRenderTarget(render, txt->cache);
     const SDL_Rect dstRect = sdlRect_(*glRect);
     SDL_RenderCopy(render, tex, &(SDL_Rect){ 0, 0, dstRect.w, dstRect.h }, &dstRect);
-    SDL_SetRenderTarget(render, NULL);
+    SDL_SetRenderTarget(render, oldTarget);
     if (tex) {
         SDL_DestroyTexture(tex);
         iAssert(surface);
@@ -670,9 +671,10 @@ void init_TextBuf(iTextBuf *d, int font, const char *text) {
                                    d->size.x,
                                    d->size.y);
     SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
+    SDL_Texture *oldTarget = SDL_GetRenderTarget(render);
     SDL_SetRenderTarget(render, d->texture);
     draw_Text_(font, zero_I2(), white_ColorId, range_CStr(text));
-    SDL_SetRenderTarget(render, NULL);
+    SDL_SetRenderTarget(render, oldTarget);
 }
 
 void deinit_TextBuf(iTextBuf *d) {