Massive folder rename, follow Apis convention, separate Imaging (WIC)

Vortice.Win32.sln

@@ -22,17 +22,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{065268A8
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D12", "src\Vortice.Win32.Direct3D12\Vortice.Win32.Direct3D12.csproj", "{020F2D80-B3D0-4AB2-AC4D-25F51028E502}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D12", "src\Vortice.Win32.Graphics.Direct3D12\Vortice.Win32.Graphics.Direct3D12.csproj", "{020F2D80-B3D0-4AB2-AC4D-25F51028E502}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D11", "src\Vortice.Win32.Direct3D11\Vortice.Win32.Direct3D11.csproj", "{32CE7567-8C9E-43AD-9543-1F0A8CA1CA76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D11", "src\Vortice.Win32.Graphics.Direct3D11\Vortice.Win32.Graphics.Direct3D11.csproj", "{32CE7567-8C9E-43AD-9543-1F0A8CA1CA76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct3D11on12", "src\Vortice.Win32.Direct3D11on12\Vortice.Win32.Direct3D11on12.csproj", "{978D804A-9F52-4ED4-95D9-BBED341E48A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D11on12", "src\Vortice.Win32.Graphics.Direct3D11on12\Vortice.Win32.Graphics.Direct3D11on12.csproj", "{978D804A-9F52-4ED4-95D9-BBED341E48A6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Dxc", "src\Vortice.Win32.Dxc\Vortice.Win32.Dxc.csproj", "{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Imaging", "src\Vortice.Win32.Graphics.Imaging\Vortice.Win32.Graphics.Imaging.csproj", "{08019242-4899-448C-AA40-9F72F3BBE9AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Direct2D", "src\Vortice.Win32.Direct2D\Vortice.Win32.Direct2D.csproj", "{942D599C-CDAC-479A-825E-1B7B84DE1328}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.DirectWrite", "src\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj", "{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.DirectWrite", "src\Vortice.Win32.DirectWrite\Vortice.Win32.DirectWrite.csproj", "{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct2D", "src\Vortice.Win32.Graphics.Direct2D\Vortice.Win32.Graphics.Direct2D.csproj", "{942D599C-CDAC-479A-825E-1B7B84DE1328}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D.Dxc", "src\Vortice.Win32.Graphics.Direct3D.Dxc\Vortice.Win32.Graphics.Direct3D.Dxc.csproj", "{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,14 +70,18 @@ Global
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08019242-4899-448C-AA40-9F72F3BBE9AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB383B94-16DF-4937-9CAD-15DE1DC77B3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{942D599C-CDAC-479A-825E-1B7B84DE1328}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Generator/Program.cs

@@ -1038,12 +1038,13 @@ public static class Program
     public static int Main(string[] args)
     {
         string repoRoot = FindRepoRoot();
-        string d3d11Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D11");
+        string d3d11Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D11");
-        string d3d12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D12");
+        string d3d12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D12");
-        string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct3D11on12");
+        string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D11on12");
-        string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Direct2D");
+        string dwritePath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.DirectWrite");
-        string dwritePath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.DirectWrite");
+        string wicPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Imaging");
-        string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Dxc");
+        string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct2D");
+        string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D.Dxc");
 
         // Generate docs
         //DocGenerator.Generate(new[] { "DXGI" }, Path.Combine(repoRoot, "Generated", "Graphics", "Dxgi.xml"));
@@ -1080,6 +1081,11 @@ public static class Program
                 outputPath = d3d11on12Path;
                 useSubFolders = false;
             }
+            else if (jsonFile == "Graphics.Imaging.json")
+            {
+                outputPath = wicPath;
+                useSubFolders = false;
+            }
             else if (jsonFile.EndsWith("Direct2D.json"))
             {
                 outputPath = d2dPath;
@@ -1096,6 +1102,7 @@ public static class Program
                 outputPath = dwritePath;
                 useSubFolders = false;
             }
+
             else if (jsonFile.EndsWith("Direct3D.Dxc.json"))
             {
                 outputPath = dxcPath;
@@ -1152,7 +1159,7 @@ public static class Program
 
         if (jsonFile == "Graphics.Direct2D.Common.json")
         {
-            docFile = $"../../../Vortice.Win32.Direct2D/Direct2D";
+            docFile = $"../../../Vortice.Win32.Graphics.Direct2D/Direct2D";
         }
         else if (jsonFile == "Graphics.Imaging.D2D.json")
         {
@@ -1160,7 +1167,7 @@ public static class Program
         }
         else if (jsonFile == "Graphics.Direct3D11on12.json")
         {
-            docFile = $"../Vortice.Win32.Direct3D11/Direct3D11";
+            docFile = $"../Vortice.Win32.Graphics.Direct3D11/Direct3D11";
         }
 
         string apiName = ns;

src/Vortice.Win32.Direct3D11on12/Generated/ResourceFlags.cs

@@ -1,27 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct3D11on12;
-
-/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS"]/*' />
-/// <unmanaged>D3D11_RESOURCE_FLAGS</unmanaged>
-public partial struct ResourceFlags
-{
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::BindFlags"]/*' />
-	public Graphics.Direct3D11.BindFlags BindFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::MiscFlags"]/*' />
-	public Graphics.Direct3D11.ResourceMiscFlags MiscFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::CPUAccessFlags"]/*' />
-	public Graphics.Direct3D11.CpuAccessFlags CPUAccessFlags;
-
-	/// <include file='../../Vortice.Win32.Direct3D11/Direct3D11.xml' path='doc/member[@name="D3D11_RESOURCE_FLAGS::StructureByteStride"]/*' />
-	public uint StructureByteStride;
-}