Compare commits

..

4 Commits

Author SHA1 Message Date
Marco Carvalho
0e95a8271a Non-flags enums should not be used in bitwise operations (#5214) 2023-06-09 19:44:22 +02:00
Marco Carvalho
76b474e97b Update ShaderConfig.cs (#5226) 2023-06-09 14:53:20 +00:00
siegmund-heiss-ich
27ee86f33b Exclude macOS from checking for changed files (#5270) 2023-06-09 15:35:24 +02:00
siegmund-heiss-ich
f7ec310231 Check if existing oldConfigPath is a Symlink (#5271) 2023-06-09 15:31:19 +02:00
8 changed files with 28 additions and 5 deletions

View File

@@ -1,5 +1,8 @@
using System;
namespace ARMeilleure.IntermediateRepresentation
{
[Flags]
enum Intrinsic : ushort
{
// X86 (SSE and AVX)

View File

@@ -741,7 +741,7 @@ namespace Ryujinx.Modules
var files = Directory.EnumerateFiles(HomeDir); // All files directly in base dir.
// Determine and exclude user files only when the updater is running, not when cleaning old files
if (_running)
if (_running && !OperatingSystem.IsMacOS())
{
// Compare the loose files in base directory against the loose files from the incoming update, and store foreign ones in a user list.
var oldFiles = Directory.EnumerateFiles(HomeDir, "*", SearchOption.TopDirectoryOnly).Select(Path.GetFileName);

View File

@@ -96,7 +96,7 @@ namespace Ryujinx.Common.Configuration
if (OperatingSystem.IsMacOS() && Mode == LaunchMode.UserProfile)
{
string oldConfigPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), DefaultBaseDir);
if (Path.Exists(oldConfigPath) && !Path.Exists(BaseDirPath))
if (Path.Exists(oldConfigPath) && !IsPathSymlink(oldConfigPath) && !Path.Exists(BaseDirPath))
{
CopyDirectory(oldConfigPath, BaseDirPath);
Directory.Delete(oldConfigPath, true);
@@ -115,6 +115,14 @@ namespace Ryujinx.Common.Configuration
Directory.CreateDirectory(KeysDirPath = Path.Combine(BaseDirPath, KeysDir));
}
// Check if existing old baseDirPath is a symlink, to prevent possible errors.
// Should be removed, when the existance of the old directory isn't checked anymore.
private static bool IsPathSymlink(string path)
{
FileAttributes attributes = File.GetAttributes(path);
return (attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
}
private static void CopyDirectory(string sourceDir, string destinationDir)
{
var dir = new DirectoryInfo(sourceDir);

View File

@@ -1,3 +1,5 @@
using System;
namespace Ryujinx.Graphics.Shader.Decoders
{
enum AlSize
@@ -711,6 +713,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
TexSamplerBorderColor = 22,
}
[Flags]
enum VectorSelect
{
U8B0 = 0,

View File

@@ -1,5 +1,8 @@
using System;
namespace Ryujinx.Graphics.Shader.Decoders
{
[Flags]
enum InstProps : ushort
{
None = 0,

View File

@@ -1,5 +1,8 @@
namespace Ryujinx.Graphics.Shader.Translation
using System;
namespace Ryujinx.Graphics.Shader.Translation
{
[Flags]
enum AggregateType
{
Invalid,

View File

@@ -726,7 +726,7 @@ namespace Ryujinx.Graphics.Shader.Translation
var descriptors = new TextureDescriptor[dict.Count];
int i = 0;
foreach (var kv in dict.OrderBy(x => x.Key.Indexed).OrderBy(x => x.Key.Handle))
foreach (var kv in dict.OrderBy(x => x.Key.Indexed).ThenBy(x => x.Key.Handle))
{
var info = kv.Key;
var meta = kv.Value;
@@ -824,4 +824,4 @@ namespace Ryujinx.Graphics.Shader.Translation
OmapTargets);
}
}
}
}

View File

@@ -1,5 +1,8 @@
using System;
namespace Ryujinx.HLE.HOS.Kernel.Threading
{
[Flags]
enum ThreadSchedState : ushort
{
LowMask = 0xf,