copying is not necessary anymore

This is not a continuation of the Metal backend; this is simply bringing
the branch up to date and merging it as-is behind an experiment.

---------

Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>
Co-authored-by: Samuliak <samuliak77@gmail.com>
Co-authored-by: SamoZ256 <96914946+SamoZ256@users.noreply.github.com>
Co-authored-by: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
Co-authored-by: riperiperi <rhy3756547@hotmail.com>
Co-authored-by: Gabriel A <gab.dark.100@gmail.com>

.gitignore

@@ -19,6 +19,9 @@ build/
 AppDir/
 publish_appimage/
 
+# Validation project assemblies folder
+/src/Ryujinx.BuildValidationTasks/temp_assemblies/
+
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
 

Directory.Packages.props

@@ -10,12 +10,12 @@
     <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
     <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
     <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.12.6" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
-    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
-    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Concentus" Version="2.2.0" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
@@ -56,4 +56,4 @@
     <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
-</Project>
+</Project>

Ryujinx.sln

@@ -80,6 +80,7 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E} = {A602AE97-91A5-4608-8DF1-EBF4ED7A0B9E}
@@ -258,13 +259,12 @@ Global
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08931FA-1191-417A-864F-3882D93E683B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A89A234-4F19-497D-A576-DDE8CDFC5B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs

@@ -8,7 +8,7 @@ using Microsoft.Build.Framework;
 
 namespace Ryujinx.BuildValidationTasks
 {
-    public class LocaleValidationTask : Task
+    public class LocalesValidationTask : Task
     {
         public override bool Execute()
         {
@@ -32,8 +32,10 @@ namespace Ryujinx.BuildValidationTasks
                 data = sr.ReadToEnd();
             }
 
+
             LocalesJson json = JsonConvert.DeserializeObject<LocalesJson>(data);
 
+
             for (int i = 0; i < json.Locales.Count; i++)
             {
                 LocalesEntry locale = json.Locales[i];

src/Ryujinx.BuildValidationTasks/Ryujinx.BuildValidationTasks.csproj

@@ -3,17 +3,62 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+
+    <temp_assemblies>$(MSBuildThisFileDirectory)temp_assemblies/</temp_assemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" />
-    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.Build.Framework" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <UsingTask TaskName="Ryujinx.BuildValidationTasks.LocaleValidationTask" TaskFactory="TaskHostFactory" AssemblyFile="$(OutDir)Ryujinx.BuildValidationTasks.dll" />
+  <Target Name="ValidationTask">
+    <Message Text="dir $(FrameworkDir)" Importance="high" />
 
-  <Target Name="LocalesJsonValidation" AfterTargets="AfterRebuild">
-    <LocaleValidationTask />
+    <Message Text="Running Validations..." Importance="high" />
+
+    <!--Run Validation Targets Here-->
+    <CallTarget Targets="MasterLocalesValidationTask" />
+
+    <Message Text="Validations Succeeded!" Importance="high" />
+  </Target>
+  
+  <!--__________________________________________________LocalesValidation Task__________________________________________________-->
+
+  <PropertyGroup>
+    <!--Name of Validation Task. <Name> refers to this name-->
+    <Name>LocalesValidation</Name>
+    <!--Dll should be "<Name>Task.dll"-->
+    <Dll>LocalesValidationTask.dll</Dll>
+  </PropertyGroup>
+
+  <!--Name should be "Build<Name>TaskDll"-->
+  <Target Name="BuildLocalesValidationTaskDll">
+    <Message Text="Building $(Name)Task..." Importance="high" />
+    <!--Remember to include References!-->
+    <Csc Sources="$(MSBuildThisFileDirectory)$(Name)Task*.cs"
+         AdditionalLibPaths="$(ProgramFiles)/dotnet/packs/Microsoft.NETCore.App.Ref/9.0.0/ref/net9.0/"
+         References="
+             System.dll;
+             System.Runtime.dll;
+             netstandard.dll;
+             System.Collections.dll;
+             System.Linq.dll;
+             $(PkgMicrosoft_Build_Framework)/ref/netstandard2.0/Microsoft.Build.Framework.dll;
+             $(PkgMicrosoft_Build_Utilities_Core)/ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll;
+             $(PkgNewtonsoft_Json)/lib/netstandard2.0/Newtonsoft.Json.dll"
+         TargetType="Library" OutputAssembly="$(MSBuildThisFileDirectory)temp_assemblies/$(Dll)"/>
+  </Target>
+
+  <UsingTask TaskName="Ryujinx.BuildValidationTasks.$(Name)Task" TaskFactory="TaskHostFactory" AssemblyFile="temp_assemblies/$(Dll)"/>
+
+  <!--Name should be "Master<Name>Task"-->
+  <Target Name="MasterLocalesValidationTask" DependsOnTargets="Build$(Name)TaskDll">
+    <Message Text="Running $(Name)Task... " Importance="high" />
+    <!--Should call "Ryujinx.BuildValidationTasks.<Name>Task"-->
+    <Ryujinx.BuildValidationTasks.LocalesValidationTask />
+    <Message Text="$(Name)Task finished!" Importance="high" />
   </Target>
 
 </Project>

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -838,6 +838,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
                 TargetApi.OpenGL => TargetLanguage.Glsl,
                 TargetApi.Vulkan => GraphicsConfig.EnableSpirvCompilationOnVulkan ? TargetLanguage.Spirv : TargetLanguage.Glsl,
                 TargetApi.Metal => TargetLanguage.Msl,
+                _ => throw new NotImplementedException()
             };
 
             return new TranslationOptions(lang, api, flags);

src/Ryujinx.Graphics.Metal/EncoderStateManager.cs

@@ -1767,6 +1767,7 @@ namespace Ryujinx.Graphics.Metal
                 Constants.StorageBuffersSetIndex => Constants.StorageBuffersIndex,
                 Constants.TexturesSetIndex => Constants.TexturesIndex,
                 Constants.ImagesSetIndex => Constants.ImagesIndex,
+                _ => throw new NotImplementedException()
             };
         }
 

src/Ryujinx.Graphics.Metal/MetalRenderer.cs

@@ -21,9 +21,12 @@ namespace Ryujinx.Graphics.Metal
         private Pipeline _pipeline;
         private Window _window;
         
-        public uint ProgramCount { get; set; } = 0;
+        public uint ProgramCount { get; set; }
 
+#pragma warning disable CS0067 // The event is never used
         public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
+#pragma warning restore CS0067
+        
         public bool PreferThreading => true;
         public IPipeline Pipeline => _pipeline;
         public IWindow Window => _window;

src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGen.cs

@@ -125,6 +125,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
                                 Instruction.Add => "PreciseFAdd",
                                 Instruction.Subtract => "PreciseFSub",
                                 Instruction.Multiply => "PreciseFMul",
+                                _ => throw new NotImplementedException()
                             };
 
                             return $"{func}({expr[0]}, {expr[1]})";

src/Ryujinx/AppHost.cs

@@ -917,7 +917,7 @@ namespace Ryujinx.Ava
 
             if (ShouldInitMetal)
             {
-#pragma warning disable CA1416 This call site is reachable on all platforms
+#pragma warning disable CA1416 // This call site is reachable on all platforms
                 // The condition does a check for Mac, on top of checking if it's an ARM Mac. This isn't a problem.
                 renderer = new MetalRenderer((RendererHost.EmbeddedWindow as EmbeddedWindowMetal)!.CreateSurface);
 #pragma warning restore CA1416

src/Ryujinx/Assets/locales.json

@@ -21694,4 +21694,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Ryujinx.csproj

@@ -13,8 +13,8 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
-  <Target Name="BuildValidationProj" BeforeTargets="BeforeRebuild">
-    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="Rebuild">
+  <Target Name="BuildValidationProj" BeforeTargets="BeforeBuild">
+    <MSBuild Projects="..\Ryujinx.BuildValidationTasks\Ryujinx.BuildValidationTasks.csproj" Targets="ValidationTask" >
     </MSBuild>
   </Target>
 

src/Ryujinx/UI/Renderer/RendererHost.axaml.cs

@@ -2,6 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Gommon;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
 using Ryujinx.UI.Common.Configuration;
 using System;
 using System.Runtime.InteropServices;
@@ -72,6 +73,16 @@ namespace Ryujinx.Ava.UI.Renderer
                     EmbeddedWindow = new EmbeddedWindowVulkan(); 
                     break;
             }
+            
+            string backendText = EmbeddedWindow switch
+            {
+                EmbeddedWindowVulkan => "Vulkan",
+                EmbeddedWindowOpenGL => "OpenGL",
+                EmbeddedWindowMetal => "Metal",
+                _ => throw new NotImplementedException()
+            };
+                    
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend ({ConfigurationState.Instance.Graphics.GraphicsBackend.Value}): {backendText}");
 
             Initialize();
         }