Update Generator & Added Nested Namespace Support

binding/Binding/SkiaApi.generated.cs

@@ -1,95 +1,102 @@
 using System;
 using System.Runtime.InteropServices;
 
+#region Namespaces
+
+
+#endregion
+
+#region Class declarations
+
+using gr_backendrendertarget_t = System.IntPtr;
+using gr_backendtexture_t = System.IntPtr;
+using gr_direct_context_t = System.IntPtr;
+using gr_glinterface_t = System.IntPtr;
+using gr_recording_context_t = System.IntPtr;
+using gr_vk_extensions_t = System.IntPtr;
+using gr_vk_memory_allocator_t = System.IntPtr;
+using gr_vkinterface_t = System.IntPtr;
+using sk_3dview_t = System.IntPtr;
+using sk_bitmap_t = System.IntPtr;
+using sk_canvas_t = System.IntPtr;
+using sk_codec_t = System.IntPtr;
+using sk_colorfilter_t = System.IntPtr;
+using sk_colorspace_icc_profile_t = System.IntPtr;
+using sk_colorspace_t = System.IntPtr;
+using sk_colortable_t = System.IntPtr;
+using sk_compatpaint_t = System.IntPtr;
+using sk_data_t = System.IntPtr;
+using sk_document_t = System.IntPtr;
+using sk_drawable_t = System.IntPtr;
+using sk_font_t = System.IntPtr;
+using sk_fontmgr_t = System.IntPtr;
+using sk_fontstyle_t = System.IntPtr;
+using sk_fontstyleset_t = System.IntPtr;
+using sk_image_t = System.IntPtr;
+using sk_imagefilter_croprect_t = System.IntPtr;
+using sk_imagefilter_t = System.IntPtr;
+using sk_manageddrawable_t = System.IntPtr;
+using sk_managedtracememorydump_t = System.IntPtr;
+using sk_maskfilter_t = System.IntPtr;
+using sk_matrix44_t = System.IntPtr;
+using sk_nodraw_canvas_t = System.IntPtr;
+using sk_nvrefcnt_t = System.IntPtr;
+using sk_nway_canvas_t = System.IntPtr;
+using sk_opbuilder_t = System.IntPtr;
+using sk_overdraw_canvas_t = System.IntPtr;
+using sk_paint_t = System.IntPtr;
+using sk_path_effect_t = System.IntPtr;
+using sk_path_iterator_t = System.IntPtr;
+using sk_path_rawiterator_t = System.IntPtr;
+using sk_path_t = System.IntPtr;
+using sk_pathmeasure_t = System.IntPtr;
+using sk_picture_recorder_t = System.IntPtr;
+using sk_picture_t = System.IntPtr;
+using sk_pixelref_factory_t = System.IntPtr;
+using sk_pixmap_t = System.IntPtr;
+using sk_refcnt_t = System.IntPtr;
+using sk_region_cliperator_t = System.IntPtr;
+using sk_region_iterator_t = System.IntPtr;
+using sk_region_spanerator_t = System.IntPtr;
+using sk_region_t = System.IntPtr;
+using sk_rrect_t = System.IntPtr;
+using sk_runtimeeffect_t = System.IntPtr;
+using sk_runtimeeffect_uniform_t = System.IntPtr;
+using sk_shader_t = System.IntPtr;
+using sk_stream_asset_t = System.IntPtr;
+using sk_stream_filestream_t = System.IntPtr;
+using sk_stream_managedstream_t = System.IntPtr;
+using sk_stream_memorystream_t = System.IntPtr;
+using sk_stream_streamrewindable_t = System.IntPtr;
+using sk_stream_t = System.IntPtr;
+using sk_string_t = System.IntPtr;
+using sk_surface_t = System.IntPtr;
+using sk_surfaceprops_t = System.IntPtr;
+using sk_svgcanvas_t = System.IntPtr;
+using sk_textblob_builder_t = System.IntPtr;
+using sk_textblob_t = System.IntPtr;
+using sk_tracememorydump_t = System.IntPtr;
+using sk_typeface_t = System.IntPtr;
+using sk_vertices_t = System.IntPtr;
+using sk_wstream_dynamicmemorystream_t = System.IntPtr;
+using sk_wstream_filestream_t = System.IntPtr;
+using sk_wstream_managedstream_t = System.IntPtr;
+using sk_wstream_t = System.IntPtr;
+using sk_xmlstreamwriter_t = System.IntPtr;
+using sk_xmlwriter_t = System.IntPtr;
+using vk_device_t = System.IntPtr;
+using vk_instance_t = System.IntPtr;
+using vk_physical_device_features_2_t = System.IntPtr;
+using vk_physical_device_features_t = System.IntPtr;
+using vk_physical_device_t = System.IntPtr;
+using vk_queue_t = System.IntPtr;
+
+#endregion
+
+#region Functions
+
 namespace SkiaSharp
 {
-	#region Class declarations
-
-	using gr_backendrendertarget_t = IntPtr;
-	using gr_backendtexture_t = IntPtr;
-	using gr_direct_context_t = IntPtr;
-	using gr_glinterface_t = IntPtr;
-	using gr_recording_context_t = IntPtr;
-	using gr_vk_extensions_t = IntPtr;
-	using gr_vk_memory_allocator_t = IntPtr;
-	using gr_vkinterface_t = IntPtr;
-	using sk_3dview_t = IntPtr;
-	using sk_bitmap_t = IntPtr;
-	using sk_canvas_t = IntPtr;
-	using sk_codec_t = IntPtr;
-	using sk_colorfilter_t = IntPtr;
-	using sk_colorspace_icc_profile_t = IntPtr;
-	using sk_colorspace_t = IntPtr;
-	using sk_colortable_t = IntPtr;
-	using sk_compatpaint_t = IntPtr;
-	using sk_data_t = IntPtr;
-	using sk_document_t = IntPtr;
-	using sk_drawable_t = IntPtr;
-	using sk_font_t = IntPtr;
-	using sk_fontmgr_t = IntPtr;
-	using sk_fontstyle_t = IntPtr;
-	using sk_fontstyleset_t = IntPtr;
-	using sk_image_t = IntPtr;
-	using sk_imagefilter_croprect_t = IntPtr;
-	using sk_imagefilter_t = IntPtr;
-	using sk_manageddrawable_t = IntPtr;
-	using sk_managedtracememorydump_t = IntPtr;
-	using sk_maskfilter_t = IntPtr;
-	using sk_matrix44_t = IntPtr;
-	using sk_nodraw_canvas_t = IntPtr;
-	using sk_nvrefcnt_t = IntPtr;
-	using sk_nway_canvas_t = IntPtr;
-	using sk_opbuilder_t = IntPtr;
-	using sk_overdraw_canvas_t = IntPtr;
-	using sk_paint_t = IntPtr;
-	using sk_path_effect_t = IntPtr;
-	using sk_path_iterator_t = IntPtr;
-	using sk_path_rawiterator_t = IntPtr;
-	using sk_path_t = IntPtr;
-	using sk_pathmeasure_t = IntPtr;
-	using sk_picture_recorder_t = IntPtr;
-	using sk_picture_t = IntPtr;
-	using sk_pixelref_factory_t = IntPtr;
-	using sk_pixmap_t = IntPtr;
-	using sk_refcnt_t = IntPtr;
-	using sk_region_cliperator_t = IntPtr;
-	using sk_region_iterator_t = IntPtr;
-	using sk_region_spanerator_t = IntPtr;
-	using sk_region_t = IntPtr;
-	using sk_rrect_t = IntPtr;
-	using sk_runtimeeffect_t = IntPtr;
-	using sk_runtimeeffect_uniform_t = IntPtr;
-	using sk_shader_t = IntPtr;
-	using sk_stream_asset_t = IntPtr;
-	using sk_stream_filestream_t = IntPtr;
-	using sk_stream_managedstream_t = IntPtr;
-	using sk_stream_memorystream_t = IntPtr;
-	using sk_stream_streamrewindable_t = IntPtr;
-	using sk_stream_t = IntPtr;
-	using sk_string_t = IntPtr;
-	using sk_surface_t = IntPtr;
-	using sk_surfaceprops_t = IntPtr;
-	using sk_svgcanvas_t = IntPtr;
-	using sk_textblob_builder_t = IntPtr;
-	using sk_textblob_t = IntPtr;
-	using sk_tracememorydump_t = IntPtr;
-	using sk_typeface_t = IntPtr;
-	using sk_vertices_t = IntPtr;
-	using sk_wstream_dynamicmemorystream_t = IntPtr;
-	using sk_wstream_filestream_t = IntPtr;
-	using sk_wstream_managedstream_t = IntPtr;
-	using sk_wstream_t = IntPtr;
-	using sk_xmlstreamwriter_t = IntPtr;
-	using sk_xmlwriter_t = IntPtr;
-	using vk_device_t = IntPtr;
-	using vk_instance_t = IntPtr;
-	using vk_physical_device_features_2_t = IntPtr;
-	using vk_physical_device_features_t = IntPtr;
-	using vk_physical_device_t = IntPtr;
-	using vk_queue_t = IntPtr;
-
-	#endregion
-
 	internal unsafe partial class SkiaApi
 	{
 		#region gr_context.h
@@ -13335,9 +13342,13 @@ internal static void sk_managedtracememorydump_set_procs (SKManagedTraceMemoryDu
 		#endregion
 
 	}
+}
 
-	#region Delegates
+#endregion Functions
 
+#region Delegates
+
+namespace SkiaSharp {
 	// typedef void (*)()* gr_gl_func_ptr
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	internal unsafe delegate void GRGlFuncPtr();
@@ -13477,9 +13488,13 @@ internal static void sk_managedtracememorydump_set_procs (SKManagedTraceMemoryDu
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	internal unsafe delegate void SKSurfaceRasterReleaseProxyDelegate(void* addr, void* context);
 
-	#endregion
+}
+
+#endregion
 
-	#region Structs
+#region Structs
+
+namespace SkiaSharp {
 
 	// gr_context_options_t
 	[StructLayout (LayoutKind.Sequential)]
@@ -15582,10 +15597,13 @@ public readonly override int GetHashCode ()
 		}
 
 	}
+}
+
+#endregion
 
-	#endregion
+#region Enums
 
-	#region Enums
+namespace SkiaSharp {
 
 	// gr_backend_t
 	internal enum GRBackendNative {
@@ -16295,6 +16313,6 @@ public enum SKWebpEncoderCompression {
 		// LOSSLESS_SK_WEBPENCODER_COMPTRESSION = 1
 		Lossless = 1,
 	}
-
-	#endregion
 }
+
+#endregion

binding/HarfBuzzSharp.Shared/HarfBuzzApi.generated.cs

@@ -1,23 +1,30 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace HarfBuzzSharp
-{
-	#region Class declarations
+#region Namespaces
+
+
+#endregion
+
+#region Class declarations
 
-	using hb_blob_t = IntPtr;
-	using hb_buffer_t = IntPtr;
-	using hb_face_t = IntPtr;
-	using hb_font_funcs_t = IntPtr;
-	using hb_font_t = IntPtr;
-	using hb_language_impl_t = IntPtr;
-	using hb_map_t = IntPtr;
-	using hb_set_t = IntPtr;
-	using hb_shape_plan_t = IntPtr;
-	using hb_unicode_funcs_t = IntPtr;
+using hb_blob_t = System.IntPtr;
+using hb_buffer_t = System.IntPtr;
+using hb_face_t = System.IntPtr;
+using hb_font_funcs_t = System.IntPtr;
+using hb_font_t = System.IntPtr;
+using hb_language_impl_t = System.IntPtr;
+using hb_map_t = System.IntPtr;
+using hb_set_t = System.IntPtr;
+using hb_shape_plan_t = System.IntPtr;
+using hb_unicode_funcs_t = System.IntPtr;
 
-	#endregion
+#endregion
 
+#region Functions
+
+namespace HarfBuzzSharp
+{
 	internal unsafe partial class HarfBuzzApi
 	{
 		#region hb-blob.h
@@ -4689,9 +4696,13 @@ private partial class Delegates {
 		#endregion
 
 	}
+}
 
-	#region Delegates
+#endregion Functions
 
+#region Delegates
+
+namespace HarfBuzzSharp {
 	// typedef hb_bool_t (*)(hb_buffer_t* buffer, hb_font_t* font, const char* message, void* user_data)* hb_buffer_message_func_t
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	[return: MarshalAs (UnmanagedType.I1)]
@@ -4761,8 +4772,8 @@ private partial class Delegates {
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	[return: MarshalAs (UnmanagedType.I1)]
 	internal unsafe delegate bool FontGetVariationGlyphProxyDelegate(hb_font_t font, void* font_data, UInt32 unicode, UInt32 variation_selector, UInt32* glyph, void* user_data);
-// TODO: typedef const const hb_language_impl_t* hb_language_t
 
+// TODO: typedef const hb_language_impl_t* hb_language_t
 	// typedef hb_blob_t* (*)(hb_face_t* face, hb_tag_t tag, void* user_data)* hb_reference_table_func_t
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	internal unsafe delegate hb_blob_t ReferenceTableProxyDelegate(hb_face_t face, UInt32 tag, void* user_data);
@@ -4801,9 +4812,13 @@ private partial class Delegates {
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 	internal unsafe delegate UInt32 UnicodeScriptProxyDelegate(hb_unicode_funcs_t ufuncs, UInt32 unicode, void* user_data);
 
-	#endregion
+}
+
+#endregion
+
+#region Structs
 
-	#region Structs
+namespace HarfBuzzSharp {
 
 	// hb_feature_t
 	[StructLayout (LayoutKind.Sequential)]
@@ -5468,10 +5483,13 @@ public readonly override int GetHashCode ()
 		}
 
 	}
+}
+
+#endregion
 
-	#endregion
+#region Enums
 
-	#region Enums
+namespace HarfBuzzSharp {
 
 	// hb_buffer_cluster_level_t
 	public enum ClusterLevel {
@@ -6029,6 +6047,6 @@ public enum UnicodeGeneralCategory {
 		// HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR = 29
 		SpaceSeparator = 29,
 	}
-
-	#endregion
 }
+
+#endregion

binding/libHarfBuzzSharp.json

@@ -2,6 +2,14 @@
 {
   "dllName": "HARFBUZZ",
   "namespace": "HarfBuzzSharp",
+  "namespaces": {
+    "hb_ot_": {
+      "prefix": "OpenType"
+    },
+    "hb_": {
+      "prefix": ""
+    }
+  },
   "className": "HarfBuzzApi",
   "includeDirs": [
     "src"

binding/libSkiaSharp.json

@@ -2,6 +2,17 @@
 {
   "dllName": "SKIA",
   "namespace": "SkiaSharp",
+  "namespaces": {
+    "sk_managed": {
+      "prefix": "SKManaged"
+    },
+    "sk_": {
+      "prefix": "SK"
+    },
+    "gr_": {
+      "prefix": "GR"
+    }
+  },
   "className": "SkiaApi",
   "includeDirs": [
     "."