Merge branch 'master' into 'master'

sdl2 guid, remove the CRC bytes (4 first characters) and replace with 0000 when creating guid

See merge request ryubing/ryujinx!2

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

@@ -117,7 +117,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private static string GetDiskCachePath()
         {
             return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
-                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId.ToLower(), "cache", "shader")
                 : null;
         }
 

src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -1,8 +1,10 @@
+using Gommon;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Exceptions;
 using Ryujinx.HLE.HOS.Ipc;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -21,22 +23,43 @@ namespace Ryujinx.HLE.HOS.Services
         private int _selfId;
         private bool _isDomain;
 
-        public IpcService(ServerBase server = null)
+        public IpcService(ServerBase server = null, bool registerTipc = false)
         {
-            CmifCommands = GetType().Assembly.GetTypes()
+            Stopwatch sw = Stopwatch.StartNew();
-                .Where(type => type == GetType())
+            
-                .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
+            CmifCommands = GetType()
+                .GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
                 .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
                 .Select(command => (command.Id, methodInfo)))
                 .ToDictionary(command => command.Id, command => command.methodInfo);
             
-            TipcCommands = GetType().Assembly.GetTypes()
+            sw.Stop();
-                .Where(type => type == GetType())
+            
-                .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
+            Logger.Debug?.Print(
+                LogClass.Emulation, 
+                $"{CmifCommands.Count} Cmif commands loaded in {sw.ElapsedTicks} ticks ({Stopwatch.Frequency} tps).",
+                GetType().AsPrettyString()
+            );
+
+            if (registerTipc)
+            {
+                sw.Start();
+
+                TipcCommands = GetType()
+                    .GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
                     .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
                         .Select(command => (command.Id, methodInfo)))
                     .ToDictionary(command => command.Id, command => command.methodInfo);
             
+                sw.Stop();
+            
+                Logger.Debug?.Print(
+                    LogClass.Emulation, 
+                    $"{TipcCommands.Count} Tipc commands loaded in {sw.ElapsedTicks} ticks ({Stopwatch.Frequency} tps).",
+                    GetType().AsPrettyString()
+                );
+            }
+            
             Server = server;
 
             _parent = this;

src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
         private bool _isInitialized;
 
-        public IUserInterface(KernelContext context, SmRegistry registry)
+        public IUserInterface(KernelContext context, SmRegistry registry) : base(registerTipc: true)
         {
             _commonServer = new ServerBase(context, "CommonServer");
             _registry = registry;

src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs

@@ -57,16 +57,19 @@ namespace Ryujinx.Input.SDL2
                 return null;
             }
 
+            // Remove the first 4 char of the guid (CRC part) to make it stable
+            string guidString = "0000" + guid.ToString().Substring(4);
+
             string id;
 
             lock (_lock)
             {
                 int guidIndex = 0;
-                id = guidIndex + "-" + guid;
+                id = guidIndex + "-" + guidString;
 
                 while (_gamepadsIds.Contains(id))
                 {
-                    id = (++guidIndex) + "-" + guid;
+                    id = (++guidIndex) + "-" + guidString;
                 }
             }