Last separation, Dxgi.

This commit is contained in:
Amer Koleci
2022-10-07 14:47:17 +02:00
parent bc6b5ab366
commit f6720c616e
136 changed files with 253 additions and 211 deletions

View File

@@ -7,7 +7,7 @@
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage> <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<EnablePreviewFeatures>true</EnablePreviewFeatures> <EnablePreviewFeatures>true</EnablePreviewFeatures>
<VersionPrefix>1.7.6</VersionPrefix> <VersionPrefix>1.8.0</VersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix> <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>

View File

@@ -36,6 +36,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Dire
EndProject 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}" 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 EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Dxgi", "src\Vortice.Win32.Graphics.Dxgi\Vortice.Win32.Graphics.Dxgi.csproj", "{9E48F17C-2AC5-45F3-8B08-3BB51690C040}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -82,6 +84,10 @@ Global
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {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.ActiveCfg = Release|Any CPU
{DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU {DF5C7A6F-8E17-41EC-A7F1-9FE03ACD75F3}.Release|Any CPU.Build.0 = Release|Any CPU
{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@@ -1038,6 +1038,7 @@ public static class Program
public static int Main(string[] args) public static int Main(string[] args)
{ {
string repoRoot = FindRepoRoot(); string repoRoot = FindRepoRoot();
string dxgiPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Dxgi");
string d3d11Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.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.Graphics.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.Graphics.Direct3D11on12"); string d3d11on12Path = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D11on12");
@@ -1066,7 +1067,12 @@ public static class Program
bool useSubFolders = true; bool useSubFolders = true;
bool cleanFolder = true; bool cleanFolder = true;
if (jsonFile.EndsWith("Direct3D11.json")) if (jsonFile == "Graphics.Dxgi.json")
{
outputPath = dxgiPath;
useSubFolders = false;
}
else if (jsonFile.EndsWith("Direct3D11.json"))
{ {
outputPath = d3d11Path; outputPath = d3d11Path;
useSubFolders = false; useSubFolders = false;
@@ -1157,7 +1163,11 @@ public static class Program
docFile = string.Empty; docFile = string.Empty;
} }
if (jsonFile == "Graphics.Direct2D.Common.json") if (jsonFile == "Graphics.Dxgi.Common.json")
{
docFile = $"../../../Vortice.Win32.Graphics.Dxgi/Dxgi";
}
else if (jsonFile == "Graphics.Direct2D.Common.json")
{ {
docFile = $"../../../Vortice.Win32.Graphics.Direct2D/Direct2D"; docFile = $"../../../Vortice.Win32.Graphics.Direct2D/Direct2D";
} }

View File

@@ -18,6 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Vortice.Win32.Graphics.Dxgi\Vortice.Win32.Graphics.Dxgi.csproj" />
<ProjectReference Include="..\Vortice.Win32.Graphics.Imaging\Vortice.Win32.Graphics.Imaging.csproj" /> <ProjectReference Include="..\Vortice.Win32.Graphics.Imaging\Vortice.Win32.Graphics.Imaging.csproj" />
<ProjectReference Include="..\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj" /> <ProjectReference Include="..\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj" />
</ItemGroup> </ItemGroup>

View File

@@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Vortice.Win32\Vortice.Win32.csproj" /> <ProjectReference Include="..\Vortice.Win32.Graphics.Dxgi\Vortice.Win32.Graphics.Dxgi.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -8,7 +8,7 @@ namespace Win32.Graphics.Dxgi;
public unsafe partial struct AdapterDescription public unsafe partial struct AdapterDescription
{ {
/// <include file='../Generated/Graphics/Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC::Description"]/*' /> /// <include file='Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC::Description"]/*' />
public readonly string GetDescription() public readonly string GetDescription()
{ {
fixed (ushort* ptr = Description) fixed (ushort* ptr = Description)
@@ -20,7 +20,7 @@ public unsafe partial struct AdapterDescription
public unsafe partial struct AdapterDescription1 public unsafe partial struct AdapterDescription1
{ {
/// <include file='../Generated/Graphics/Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1::Description"]/*' /> /// <include file='Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC1::Description"]/*' />
public readonly string GetDescription() public readonly string GetDescription()
{ {
fixed (ushort* ptr = Description) fixed (ushort* ptr = Description)
@@ -32,7 +32,7 @@ public unsafe partial struct AdapterDescription1
public unsafe partial struct AdapterDescription2 public unsafe partial struct AdapterDescription2
{ {
/// <include file='../Generated/Graphics/Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC2::Description"]/*' /> /// <include file='Dxgi.xml' path='doc/member[@name="DXGI_ADAPTER_DESC2::Description"]/*' />
public readonly string GetDescription() public readonly string GetDescription()
{ {
fixed (ushort* ptr = Description) fixed (ushort* ptr = Description)

Some files were not shown because too many files have changed in this diff Show More