#8: Audio project and initial XAudio2 project.

Author: amerkoleci

Diff for: Vortice.sln

@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawTriangle", "src\samples
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawTriangle.Windows", "src\samples\Graphics\DrawTriangle.Windows\DrawTriangle.Windows.csproj", "{96F40ED5-9D9E-4D06-A308-BA76E0F3616C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Graphics", "src\Vortice.Graphics\Vortice.Graphics.csproj", "{AFF4E338-AA0B-4B5A-9B62-E21410D03862}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Graphics", "src\Graphics\Vortice.Graphics\Vortice.Graphics.csproj", "{AFF4E338-AA0B-4B5A-9B62-E21410D03862}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{FD5B16DA-11E1-4A00-90E7-C5EE246B7C4E}"
 EndProject
@@ -41,6 +41,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Audio", "Audio", "{F0193F7C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Input", "src\Vortice.Input\Vortice.Input.csproj", "{5276BD22-F00F-4C77-B762-C7700AA4128F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grapihcs", "Grapihcs", "{783D107C-4D46-4B9D-95C1-0DD706142BE2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Audio", "src\Audio\Vortice.Audio\Vortice.Audio.csproj", "{03BCF697-C6A0-4A76-B4F0-255920B95DD0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Audio.XAudio2", "src\Audio\Vortice.Audio.XAudio2\Vortice.Audio.XAudio2.csproj", "{43FB232A-784D-4BE7-916C-022D7CAD8C7E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +81,14 @@ Global
 		{5276BD22-F00F-4C77-B762-C7700AA4128F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5276BD22-F00F-4C77-B762-C7700AA4128F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5276BD22-F00F-4C77-B762-C7700AA4128F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03BCF697-C6A0-4A76-B4F0-255920B95DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03BCF697-C6A0-4A76-B4F0-255920B95DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03BCF697-C6A0-4A76-B4F0-255920B95DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03BCF697-C6A0-4A76-B4F0-255920B95DD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43FB232A-784D-4BE7-916C-022D7CAD8C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43FB232A-784D-4BE7-916C-022D7CAD8C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43FB232A-784D-4BE7-916C-022D7CAD8C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43FB232A-784D-4BE7-916C-022D7CAD8C7E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,7 +97,10 @@ Global
 		{4E0EA7FF-529D-4F30-977E-A5C7F3D83835} = {D8EC0278-B4F9-4EF5-A4BE-FE2284C6ECED}
 		{0DB41C96-7D02-41EE-8E7B-F2B1024A8659} = {4E0EA7FF-529D-4F30-977E-A5C7F3D83835}
 		{96F40ED5-9D9E-4D06-A308-BA76E0F3616C} = {4E0EA7FF-529D-4F30-977E-A5C7F3D83835}
+		{AFF4E338-AA0B-4B5A-9B62-E21410D03862} = {783D107C-4D46-4B9D-95C1-0DD706142BE2}
 		{F6A4373B-0A3F-45F1-BA64-7AD30BB7F04C} = {FD5B16DA-11E1-4A00-90E7-C5EE246B7C4E}
+		{03BCF697-C6A0-4A76-B4F0-255920B95DD0} = {F0193F7C-734B-48E9-BDA2-5ECD97AC37EC}
+		{43FB232A-784D-4BE7-916C-022D7CAD8C7E} = {F0193F7C-734B-48E9-BDA2-5ECD97AC37EC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {85020CE7-9EF6-4502-94F6-98643E762B78}

Diff for: src/Audio/Vortice.Audio.XAudio2/Vortice.Audio.XAudio2.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Vortice.Audio\Vortice.Audio.csproj" />
+    <PackageReference Include="TerraFX.Interop.Windows" Version="10.0.20348-rc2.1411011823" Condition="'$(ExcludeD3D12)' != 'true'" />
+  </ItemGroup>
+
+</Project>

Diff for: src/Audio/Vortice.Audio.XAudio2/XAudio2Helpers.cs

@@ -0,0 +1,22 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.Toolkit.Diagnostics;
+using TerraFX.Interop;
+using static TerraFX.Interop.Windows;
+
+namespace Vortice.Audio
+{
+    internal static unsafe class XAudio2Helpers
+    {
+        public static void ThrowIfFailed(HRESULT hr)
+        {
+            if (hr.FAILED)
+            {
+                ThrowHelper.ThrowWin32Exception(hr);
+            }
+        }
+    }
+}

Diff for: src/Audio/Vortice.Audio.XAudio2/XAudio2System.cs

@@ -0,0 +1,21 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System;
+using Microsoft.Toolkit.Diagnostics;
+using TerraFX.Interop;
+using static TerraFX.Interop.Windows;
+using static Vortice.Audio.XAudio2Helpers;
+
+namespace Vortice.Audio
+{
+    public sealed unsafe class XAudio2System : AudioSystem
+    {
+        private readonly ComPtr<IXAudio2> _xaudio2;
+
+        public XAudio2System()
+        {
+            ThrowIfFailed(XAudio2Create(_xaudio2.GetAddressOf()));
+        }
+    }
+}

Diff for: src/Audio/Vortice.Audio/AudioSystem.cs

@@ -0,0 +1,15 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System;
+using Microsoft.Toolkit.Diagnostics;
+
+namespace Vortice.Audio
+{
+    public abstract class AudioSystem //: GameSystem
+    {
+        protected AudioSystem()
+        {
+        }
+    }
+}

Diff for: src/Audio/Vortice.Audio/Vortice.Audio.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Vortice\Vortice.csproj" />
+  </ItemGroup>
+
+</Project>

Diff for: src/Vortice.Graphics/CommandQueueType.cs renamed to src/Graphics/Vortice.Graphics/CommandQueueType.cs

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ExcludeVulkan>true</ExcludeVulkan>
     <DefineConstants Condition="'$(ExcludeD3D12)' == 'true'">$(DefineConstants);EXCLUDE_D3D12_BACKEND</DefineConstants>
     <DefineConstants Condition="'$(ExcludeVulkan)' == 'true'">$(DefineConstants);EXCLUDE_VULKAN_BACKEND</DefineConstants>

Diff for: src/Vortice.Graphics/D3D12/ComPtrExtensions.cs renamed to src/Graphics/Vortice.Graphics/D3D12/ComPtrExtensions.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
+using Vortice.Audio;
 using Vortice.Graphics;
 using Vortice.Input;
 
@@ -36,9 +37,11 @@ protected Game(GameContext context)
             View = _serviceProvider.GetRequiredService<GameView>();
             Input = _serviceProvider.GetRequiredService<InputManager>();
 
+            // Get optional services.
+            Audio = _serviceProvider.GetService<AudioSystem>();
+
             // Create GraphicsDeviceFactory
             ValidationMode validationMode = ValidationMode.Disabled;
-
 #if DEBUG
             validationMode = ValidationMode.Enabled;
 #endif
@@ -69,6 +72,7 @@ protected Game(GameContext context)
         public GameView View { get; }
 
         public InputManager Input { get; }
+        public AudioSystem? Audio { get; }
 
         public GraphicsDeviceFactory GraphicsDeviceFactory { get; }
 

Diff for: src/Vortice.Graphics/D3D12/D3D12Extensions.cs renamed to src/Graphics/Vortice.Graphics/D3D12/D3D12Extensions.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
@@ -16,9 +16,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Vortice.Graphics\Vortice.Graphics.csproj" />
-    <ProjectReference Include="..\Vortice.Input\Vortice.Input.csproj" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
+    <ProjectReference Include="..\Audio\Vortice.Audio\Vortice.Audio.csproj" />
+    <ProjectReference Include="..\Graphics\Vortice.Graphics\Vortice.Graphics.csproj" />
+    <ProjectReference Include="..\Vortice.Input\Vortice.Input.csproj" />
   </ItemGroup>
 
   <Import Project="..\targets\Vortice.MultiTargeting.targets" />

Diff for: src/Vortice.Graphics/D3D12/D3D12GraphicsAdapter.cs renamed to src/Graphics/Vortice.Graphics/D3D12/D3D12GraphicsAdapter.cs

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>