implement frame buffer fetch extension for iOS, change composition on stroke drawing and commit, add rename layer dialog

engine/shader.h

@@ -10,6 +10,8 @@ enum class kShaderUniform : uint16_t
     TexFG = const_hash("tex_fg"),
     TexBG = const_hash("tex_bg"),
     TexMask = const_hash("tex_mask"),
+    TexStroke = const_hash("tex_stroke"),
+    Lock = const_hash("lock"),
     Col = const_hash("col"),
     Tof = const_hash("tof"),
     Tsz = const_hash("tsz"),
@@ -23,16 +25,18 @@ enum class kShader : uint16_t
     ColorQuad   = const_hash("color-quad"),
     ColorHue    = const_hash("color-hue"),
     Texture     = const_hash("texture"),
-    TextureAlpha = const_hash("texture-alpha"),
+    TextureAlpha= const_hash("texture-alpha"),
+    CompErase   = const_hash("comp-erase"),
+    CompDraw    = const_hash("comp-draw"),
     UVs         = const_hash("uvs"),
     Font        = const_hash("font"),
     Atlas       = const_hash("atlas"),
     Stroke      = const_hash("stroke"),
-    StrokeLock = const_hash("stroke-lock"),
+    StrokeLock  = const_hash("stroke-lock"),
     StrokeErase = const_hash("stroke-erase"),
     StrokeLayer = const_hash("stroke-layer"),
     Checkerboard= const_hash("checkerboard"),
-    Equirect = const_hash("equirect"),
+    Equirect    = const_hash("equirect"),
 };
 
 class Shader
@@ -67,4 +71,4 @@ public:
     static void invalidate();
 };
 
-}
+}