Fix memory leak

Author: LunaTheFoxgirl

building-a-renderer.md

@@ -16,9 +16,10 @@ struct DrawCmd {
     in_drawstate_t      state;
     in_blend_mode_t     blendMode;
     in_mask_mode_t      maskMode;
+    uint32_t            allocId;
     uint32_t            vtxOffset;
     uint32_t            idxOffset;
-    uint                type;
+    uint32_t            type;
     void[64]            vars;
 }
 ```

source/inochi2d/cffi/puppet.d

@@ -105,6 +105,8 @@ void in_puppet_free(in_puppet_t* obj) {
     import core.memory : GC;
     if (obj) {
         GC.removeRoot(cast(void*)obj);
+        assumeNoGC(&destroy!(false, Puppet), cast(Puppet)obj);
+        GC.free(obj);
     }
 }
 

source/inochi2d/cffi/render.d

@@ -131,7 +131,7 @@ void in_texture_flip_vertically(in_texture_t* obj) {
 }
 
 /**
-    Pre-multiplies the alpha channel of the texture.
+    Premultiplies the alpha channel of the texture.
 
     Params:
         obj = The texture object.
@@ -140,6 +140,27 @@ void in_texture_premultiply(in_texture_t* obj) {
     (cast(Texture)obj).data.premultiply();
 }
 
+/**
+    Un-premultiplies the alpha channel of the texture.
+
+    Params:
+        obj = The texture object.
+*/
+void in_texture_unpremultiply(in_texture_t* obj) {
+    (cast(Texture)obj).data.unpremultiply();
+}
+
+/**
+    Pads the texture with a border.
+
+    Params:
+        obj =       The texture object.
+        thickness = Thickness of the border in pixels.
+*/
+void in_texture_pad(in_texture_t* obj, uint thickness) {
+    (cast(Texture)obj).data.pad(thickness);
+}
+
 /**
     Gets the pixels of the texture.
 
@@ -210,6 +231,7 @@ struct in_drawcmd_t {
     in_drawstate_t                      state;
     in_blend_mode_t                     blendMode;
     in_mask_mode_t                      maskMode;
+    uint                                allocId;
     uint                                vtxOffset;
     uint                                idxOffset;
     uint                                elemCount;
@@ -225,6 +247,7 @@ struct in_drawalloc_t {
     uint idxOffset;
     uint idxCount;
     uint vtxCount;
+    uint allocId;
 }
 
 /**

source/inochi2d/core/render/drawlist.d

@@ -48,6 +48,15 @@ private:
 
 public:
 
+    // Destructor
+    ~this() {
+        _cmds.clear();
+        _vtxs.clear();
+        _idxs.clear();
+        _allocs.clear();
+        _targetsStack.clear();   
+    }
+
     /**
         Whether to use base vertex specification.
     */
@@ -111,6 +120,7 @@ public:
         _vtxp += vtx.length;
         _idxp += idx.length;
 
+        _call.allocId = _allp;
         _call.idxCount = cast(uint)idx.length;
         _call.vtxCount = cast(uint)vtx.length;
 
@@ -181,6 +191,7 @@ public:
     void setMesh(DrawListAlloc* alloc) {
         if (!alloc) return;
 
+        _ccmd.allocId = alloc.allocId;
         _ccmd.idxOffset = alloc.idxOffset;
         _ccmd.vtxOffset = alloc.vtxOffset;
         _ccmd.elemCount = alloc.idxCount;
@@ -249,6 +260,11 @@ struct DrawListAlloc {
         Number of vertices.
     */
     uint vtxCount;
+
+    /**
+        Allocation ID.
+    */
+    uint allocId;
 }
 
 /**
@@ -318,6 +334,11 @@ struct DrawCmd {
     */
     MaskingMode maskMode;
 
+    /**
+        Allocation ID.
+    */
+    uint allocId;
+
     /**
         Vertex offset.
     */

source/inochi2d/core/render/texture.d

@@ -198,15 +198,52 @@ public:
         Premultiplies incoming color data.
     */
     void premultiply() {
+        final switch(format) {
+            case TextureFormat.rgba8Unorm:
+                ubyte[] dataView = cast(ubyte[])data;
+                foreach(i; 0..data.length/4) {
+                    size_t offsetPixel = (i*4);
+
+                    float r = (cast(float)dataView[offsetPixel+0]/255.0) * (cast(float)dataView[offsetPixel+3]/255.0);
+                    float g = (cast(float)dataView[offsetPixel+1]/255.0) * (cast(float)dataView[offsetPixel+3]/255.0);
+                    float b = (cast(float)dataView[offsetPixel+2]/255.0) * (cast(float)dataView[offsetPixel+3]/255.0);
+
+                    dataView[offsetPixel+0] = cast(ubyte)(r*255.0);
+                    dataView[offsetPixel+1] = cast(ubyte)(g*255.0);
+                    dataView[offsetPixel+2] = cast(ubyte)(b*255.0);
+                }
+                return;
+            
+            case TextureFormat.none:
+            case TextureFormat.depthStencil:
+            case TextureFormat.r8:
+                return;
+        }
+    }
+
+    /**
+        Un-premultiplies incoming color data.
+    */
+    void unpremultiply() {
         final switch(format) {
             case TextureFormat.rgba8Unorm:
                 ubyte[] dataView = cast(ubyte[])data;
                 foreach(i; 0..data.length/4) {
 
                     size_t offsetPixel = (i*4);
-                    dataView[offsetPixel+0] = cast(ubyte)((cast(int)dataView[offsetPixel+0] * cast(int)dataView[offsetPixel+3])/255);
-                    dataView[offsetPixel+1] = cast(ubyte)((cast(int)dataView[offsetPixel+1] * cast(int)dataView[offsetPixel+3])/255);
-                    dataView[offsetPixel+2] = cast(ubyte)((cast(int)dataView[offsetPixel+2] * cast(int)dataView[offsetPixel+3])/255);
+
+                    // Ensure no divide by zero happens.
+                    if (cast(float)dataView[offsetPixel+3] == 0) {
+                        dataView[offsetPixel..offsetPixel+3] = 0;
+                        continue;
+                    }
+
+                    float r = (cast(float)dataView[offsetPixel+0]/255.0) / (cast(float)dataView[offsetPixel+3]/255.0);
+                    float g = (cast(float)dataView[offsetPixel+1]/255.0) / (cast(float)dataView[offsetPixel+3]/255.0);
+                    float b = (cast(float)dataView[offsetPixel+2]/255.0) / (cast(float)dataView[offsetPixel+3]/255.0);
+                    dataView[offsetPixel+0] = cast(ubyte)(r*255.0);
+                    dataView[offsetPixel+1] = cast(ubyte)(g*255.0);
+                    dataView[offsetPixel+2] = cast(ubyte)(b*255.0);
                 }
                 return;
 
@@ -217,6 +254,35 @@ public:
         }
     }
 
+    /**
+        Pads the texture with a 1-pixel wide border.
+
+        Params:
+            thickness = The border thickness to generate.
+    */
+    void pad(uint thickness) {
+        if (data.length == 0)
+            return;
+
+        uint totalPad = thickness*2;
+        ubyte[] newData = nu_malloca!ubyte((width+totalPad)*(height+totalPad)*channels);
+        newData[0..$] = 0;
+
+        size_t srcStride = width*channels;
+        size_t dstStride = (width+totalPad)*channels;
+        foreach(y; 0..height) {
+            size_t start = (dstStride*(y+thickness))+(thickness*channels);
+            size_t end = start + srcStride;
+            newData[start..end] = cast(ubyte[])data[srcStride*y..(srcStride*y)+srcStride];
+        }
+
+        // Update the texture
+        nu_freea(data);
+        this.data = newData;
+        this.width = width+totalPad;
+        this.height = height+totalPad;
+    }
+
     /**
         Dumps the image data to the specified file.