Add explicit dependency on System.Drawing.Common on Ryujinx.Ava to workaround triming bugs

misc: Remove dependency on System.Drawing.Common (#4082 )
We only used it in one spot for DPI scaling factor. This implements the same behaviour using gdiplus. This remove 700KB of dependency to download and around 170KB unpacked.
2022-12-09 20:12:09 +01:00 · 2022-12-09 18:00:53 +01:00 · 2022-12-09 16:15:28 +00:00 · 2022-12-09 15:46:07 +01:00 · 2022-12-09 15:21:54 +01:00 · 2022-12-09 14:16:22 +01:00
15 changed files with 115 additions and 33 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,7 @@ on:
      - '*.yml'
      - 'README.md'

+concurrency: release

 jobs:
  release:
--- a/Ryujinx.Ava/Assets/Styles/Styles.xaml
+++ b/Ryujinx.Ava/Assets/Styles/Styles.xaml
@@ -161,6 +161,7 @@
    <Style Selector="MenuItem">
        <Setter Property="Height" Value="{DynamicResource MenuItemHeight}" />
        <Setter Property="Padding" Value="{DynamicResource MenuItemPadding}" />
+        <Setter Property="FontSize" Value="12" />
    </Style>
    <Style Selector="MenuItem:selected /template/ Border#root">
        <Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" />
--- a/Ryujinx.Ava/Ryujinx.Ava.csproj
+++ b/Ryujinx.Ava/Ryujinx.Ava.csproj
@@ -32,8 +32,7 @@

    <PackageReference Include="OpenTK.Core" Version="4.7.5" />
    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build10" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.osx" Version="5.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" />
    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
    <PackageReference Include="Silk.NET.Vulkan" Version="2.16.0" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" />
@@ -41,6 +40,9 @@
    <PackageReference Include="SPB" Version="0.0.4-build28" />
    <PackageReference Include="SharpZipLib" Version="1.4.1" />
    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+
+    <!--NOTE: DO NOT REMOVE, THIS IS REQUIRED AS A RESULT OF A TRIMMING ISSUE IN AVALONIA -->
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/Ryujinx.Ava/Ui/Controls/GameListView.axaml
+++ b/Ryujinx.Ava/Ui/Controls/GameListView.axaml
@@ -138,6 +138,9 @@
                <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
                    <Setter Property="Background" Value="{DynamicResource AppListBackgroundColor}" />
                </Style>
+                <Style Selector="ListBoxItem:selected /template/ Border#SelectionIndicator">
+                    <Setter Property="MinHeight" Value="100" />
+                </Style>
                <Style Selector="ListBoxItem:pointerover /template/ ContentPresenter">
                    <Setter Property="Background" Value="{DynamicResource AppListHoverBackgroundColor}" />
                </Style>
--- a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml
+++ b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml
@@ -12,9 +12,9 @@
    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
    Title="Ryujinx"
    Width="1280"
-    Height="785"
+    Height="777"
    MinWidth="1092"
-    MinHeight="680"
+    MinHeight="672"
    d:DesignHeight="720"
    d:DesignWidth="1280"
    x:CompileBindings="True"
@@ -552,9 +552,8 @@
            <Grid
                Name="StatusBar"
                Grid.Row="2"
-                MinHeight="30"
-                Height="30"
-                Margin="0,0"
+                Margin="0"
+                MinHeight="22"
                HorizontalAlignment="Stretch"
                VerticalAlignment="Bottom"
                Background="{DynamicResource ThemeContentBackgroundColor}"
@@ -568,7 +567,7 @@
                </Grid.ColumnDefinitions>
                <StackPanel
                    Grid.Column="0"
-                    Margin="10,0"
+                    Margin="5"
                    VerticalAlignment="Center"
                    IsVisible="{Binding EnableNonGameRunningControls}">
                    <Grid Margin="0">
@@ -610,14 +609,14 @@
                </StackPanel>
                <StackPanel
                    Grid.Column="1"
-                    Margin="10,0"
+                    Margin="0,2"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
                    IsVisible="{Binding IsGameRunning}"
                    Orientation="Horizontal">
                    <TextBlock
                        Name="VsyncStatus"
-                        Margin="0,0,5,0"
+                        Margin="5,0,5,0"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Center"
                        Foreground="{Binding VsyncColor}"
@@ -628,7 +627,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -644,7 +643,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -660,13 +659,13 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
                    <ui:ToggleSplitButton
                        Name="VolumeStatus"
-                        Padding="5"
+                        Padding="5,0,5,0"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Center"
                        VerticalContentAlignment="Center"
@@ -679,6 +678,7 @@
                            <Flyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
                                <Grid Margin="0">
                                    <Slider
+                                        MaxHeight="40"
                                        Width="150"
                                        Margin="0"
                                        Padding="0"
@@ -697,7 +697,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -711,7 +711,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -725,7 +725,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -739,7 +739,7 @@
                    <Border
                        Width="2"
                        Height="12"
-                        Margin="2,0"
+                        Margin="0"
                        BorderBrush="Gray"
                        BorderThickness="1"
                        IsVisible="{Binding !ShowLoadProgress}" />
@@ -753,7 +753,7 @@
                </StackPanel>
                <StackPanel
                    Grid.Column="3"
-                    Margin="10,0"
+                    Margin="0,0,5,0"
                    VerticalAlignment="Center"
                    IsVisible="{Binding ShowFirmwareStatus}"
                    Orientation="Horizontal">
--- a/Ryujinx.Common/Ryujinx.Common.csproj
+++ b/Ryujinx.Common/Ryujinx.Common.csproj
@@ -7,7 +7,6 @@

  <ItemGroup>
    <PackageReference Include="MsgPack.Cli" Version="1.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
    <PackageReference Include="System.Management" Version="7.0.0" />
  </ItemGroup>

--- a/Ryujinx.Common/System/ForceDpiAware.cs
+++ b/Ryujinx.Common/System/ForceDpiAware.cs
@@ -1,6 +1,5 @@
 using Ryujinx.Common.Logging;
 using System;
-using System.Drawing;
 using System.Globalization;
 using System.Runtime.InteropServices;

@@ -51,7 +50,7 @@ namespace Ryujinx.Common.System
            {
                if (OperatingSystem.IsWindows())
                {
-                    userDpiScale = Graphics.FromHwnd(IntPtr.Zero).DpiX;
+                    userDpiScale = GdiPlusHelper.GetDpiX(IntPtr.Zero);
                }
                else if (OperatingSystem.IsLinux())
                {
--- a/Ryujinx.Common/System/GdiPlusHelper.cs
+++ b/Ryujinx.Common/System/GdiPlusHelper.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace Ryujinx.Common.System
+{
+    [SupportedOSPlatform("windows")]
+    public static class GdiPlusHelper
+    {
+        private const string LibraryName = "gdiplus.dll";
+
+        private static readonly IntPtr _initToken;
+
+        static GdiPlusHelper()
+        {
+            CheckStatus(GdiplusStartup(out _initToken, StartupInputEx.Default, out _));
+        }
+
+        private static void CheckStatus(int gdiStatus)
+        {
+            if (gdiStatus != 0)
+            {
+                throw new Exception($"GDI Status Error: {gdiStatus}");
+            }
+        }
+
+        private struct StartupInputEx
+        {
+            public int GdiplusVersion;
+
+#pragma warning disable CS0649
+            public IntPtr DebugEventCallback;
+            public int SuppressBackgroundThread;
+            public int SuppressExternalCodecs;
+            public int StartupParameters;
+#pragma warning restore CS0649
+
+            public static StartupInputEx Default => new StartupInputEx
+            {
+                // We assume Windows 8 and upper
+                GdiplusVersion = 2,
+                DebugEventCallback = IntPtr.Zero,
+                SuppressBackgroundThread = 0,
+                SuppressExternalCodecs = 0,
+                StartupParameters = 0,
+            };
+        }
+
+        private struct StartupOutput
+        {
+            public IntPtr NotificationHook;
+            public IntPtr NotificationUnhook;
+        }
+
+        [DllImport(LibraryName)]
+        private static extern int GdiplusStartup(out IntPtr token, in StartupInputEx input, out StartupOutput output);
+
+        [DllImport(LibraryName)]
+        private static extern int GdipCreateFromHWND(IntPtr hwnd, out IntPtr graphics);
+
+        [DllImport(LibraryName)]
+        private static extern int GdipDeleteGraphics(IntPtr graphics);
+
+        [DllImport(LibraryName)]
+        private static extern int GdipGetDpiX(IntPtr graphics, out float dpi);
+
+        public static float GetDpiX(IntPtr hwnd)
+        {
+            CheckStatus(GdipCreateFromHWND(hwnd, out IntPtr graphicsHandle));
+            CheckStatus(GdipGetDpiX(graphicsHandle, out float result));
+            CheckStatus(GdipDeleteGraphics(graphicsHandle));
+
+            return result;
+        }
+    }
+}
--- a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
+++ b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        private const ushort FileFormatVersionMajor = 1;
        private const ushort FileFormatVersionMinor = 2;
        private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 4028;
+        private const uint CodeGenVersion = 4069;

        private const string SharedTocFileName = "shared.toc";
        private const string SharedDataFileName = "shared.data";
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl
@@ -2,6 +2,6 @@ float Helper_SwizzleAdd(float x, float y, int mask)
 {
    vec4 xLut = vec4(1.0, -1.0, 1.0, 0.0);
    vec4 yLut = vec4(1.0, 1.0, -1.0, 1.0);
-    int lutIdx = mask >> int($SUBGROUP_INVOCATION$ & 3u) * 2;
+    int lutIdx = (mask >> (int($SUBGROUP_INVOCATION$ & 3u) * 2)) & 3;
    return x * xLut[lutIdx] + y * yLut[lutIdx];
 }
--- a/Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs
@@ -1449,10 +1449,13 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
            var xLut = context.ConstantComposite(v4float, one, minusOne, one, zero);
            var yLut = context.ConstantComposite(v4float, one, one, minusOne, one);

+            var three = context.Constant(context.TypeU32(), 3);
+
            var threadId = context.GetAttribute(AggregateType.U32, AttributeConsts.LaneId, false);
-            var shift = context.BitwiseAnd(context.TypeU32(), threadId, context.Constant(context.TypeU32(), 3));
+            var shift = context.BitwiseAnd(context.TypeU32(), threadId, three);
            shift = context.ShiftLeftLogical(context.TypeU32(), shift, context.Constant(context.TypeU32(), 1));
            var lutIdx = context.ShiftRightLogical(context.TypeU32(), mask, shift);
+            lutIdx = context.BitwiseAnd(context.TypeU32(), lutIdx, three);

            var xLutValue = context.VectorExtractDynamic(context.TypeFP32(), xLut, lutIdx);
            var yLutValue = context.VectorExtractDynamic(context.TypeFP32(), yLut, lutIdx);
--- a/Ryujinx.Graphics.Shader/Translation/AttributeConsts.cs
+++ b/Ryujinx.Graphics.Shader/Translation/AttributeConsts.cs
@@ -8,6 +8,7 @@ namespace Ryujinx.Graphics.Shader.Translation
        public const int TessLevelOuter3     = 0x00c;
        public const int TessLevelInner0     = 0x010;
        public const int TessLevelInner1     = 0x014;
+        public const int PrimitiveId         = 0x060;
        public const int Layer               = 0x064;
        public const int ViewportIndex       = 0x068;
        public const int PointSize           = 0x06c;
@@ -85,8 +86,7 @@ namespace Ryujinx.Graphics.Shader.Translation
        public const int LaneId = 0x2000020;

        public const int InvocationId = 0x2000024;
-        public const int PrimitiveId = 0x2000028;
-        public const int PatchVerticesIn = 0x200002c;
+        public const int PatchVerticesIn = 0x2000028;

        public const int EqMask = 0x2000030;
        public const int GeMask = 0x2000034;
--- a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
+++ b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
@@ -12,8 +12,7 @@

  <ItemGroup>
    <PackageReference Include="OpenTK.Core" Version="4.7.5" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build10" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.osx" Version="5.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" />
  </ItemGroup>

  <ItemGroup>
@@ -29,7 +28,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
  </ItemGroup>

 	<ItemGroup>
--- a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj
+++ b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj
@@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
  </ItemGroup>

 </Project>
--- a/Ryujinx/Ryujinx.csproj
+++ b/Ryujinx/Ryujinx.csproj
@@ -22,8 +22,7 @@
    <PackageReference Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
    <PackageReference Include="GtkSharp.Dependencies" Version="1.1.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
    <PackageReference Include="GtkSharp.Dependencies.osx" Version="0.0.5" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build10" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.osx" Version="5.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build12" />
    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
    <PackageReference Include="OpenTK.Core" Version="4.7.5" />
Author	SHA1	Message	Date
Mary	539b22ef7b	Add explicit dependency on System.Drawing.Common on Ryujinx.Ava to workaround triming bugs	2022-12-09 20:12:09 +01:00
Mary-nyan	872f036d64	misc: Remove dependency on System.Drawing.Common (#4082 ) We only used it in one spot for DPI scaling factor. This implements the same behaviour using gdiplus. This remove 700KB of dependency to download and around 170KB unpacked.	2022-12-09 18:00:53 +01:00
TSRBerry	dca96122bf	gha: Add concurrency restriction on release workflow (#4081 )	2022-12-09 16:15:28 +00:00
Mary-nyan	e752959109	misc: Update Ryujinx.Graphics.Nvdec.Dependencies to 5.0.1-build12 (#4080 ) This adds support for Linux x64, macOS x64 and macOS arm64.	2022-12-09 15:46:07 +01:00
Ac_K	cf01664698	ava: Restyle the Status Bar (#4048 )	2022-12-09 15:21:54 +01:00
dependabot[bot]	b283a4adcd	nuget: bump CommandLineParser from 2.8.0 to 2.9.1 (#4058 ) Bumps [CommandLineParser](https://github.com/commandlineparser/commandline) from 2.8.0 to 2.9.1. - [Release notes](https://github.com/commandlineparser/commandline/releases) - [Changelog](https://github.com/commandlineparser/commandline/blob/master/CHANGELOG.md) - [Commits](https://github.com/commandlineparser/commandline/compare/2.8.0...v2.9.1) --- updated-dependencies: - dependency-name: CommandLineParser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-12-09 14:16:22 +01:00
gdkchan	8428bb6541	Fix shader FSWZADD instruction (#4069 ) * Fix shader FSWZADD instruction * Shader cache version bump	2022-12-08 14:08:07 -03:00
gdkchan	9a0330f7f8	Shader: Implement PrimitiveID (#4067 ) * Shader: Implement PrimitiveID * Shader cache version bump	2022-12-08 10:55:03 +01:00