manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-07 16:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Legacy namespace

Browse source
This commit is contained in:
Isaac Marovitz 2024-05-09 12:10:46 -04:00
parent 4ee4b0f3ac
commit d8b7d87e13
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
38 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Directory.Packages.props
View file

@ -38,7 +38,6 @@
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" /> <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
<PackageVersion Include="shaderc.net" Version="0.1.0" /> <PackageVersion Include="shaderc.net" Version="0.1.0" />
<PackageVersion Include="SharpZipLib" Version="1.4.2" /> <PackageVersion Include="SharpZipLib" Version="1.4.2" />
<PackageVersion Include="Silk.NET.OpenGL" Version="2.21.0" />
<PackageVersion Include="Silk.NET.OpenGL.Legacy" Version="2.21.0" /> <PackageVersion Include="Silk.NET.OpenGL.Legacy" Version="2.21.0" />
<PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" /> <PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" /> <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.16.0" />

2
src/Ryujinx.Graphics.OpenGL/Buffer.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/Debugger.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/DrawTextureEmulation.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;
using System; using System;
using Sampler = Ryujinx.Graphics.OpenGL.Image.Sampler; using Sampler = Ryujinx.Graphics.OpenGL.Image.Sampler;

2
src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;

2
src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;

2
src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
namespace Ryujinx.Graphics.OpenGL.Effects namespace Ryujinx.Graphics.OpenGL.Effects
{ {

2
src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;

14
src/Ryujinx.Graphics.OpenGL/EnumConversion.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Shader; using Ryujinx.Graphics.Shader;
@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.OpenGL
switch (mode) switch (mode)
{ {
case AddressMode.Clamp: case AddressMode.Clamp:
return GLEnum.Clamp; return TextureWrapMode.Clamp;
case AddressMode.Repeat: case AddressMode.Repeat:
return TextureWrapMode.Repeat; return TextureWrapMode.Repeat;
case AddressMode.MirrorClamp: case AddressMode.MirrorClamp:
@ -411,21 +411,21 @@ namespace Ryujinx.Graphics.OpenGL
return TextureMinFilter.Nearest; return TextureMinFilter.Nearest;
} }
public static Silk.NET.OpenGL.PolygonMode Convert(this GAL.PolygonMode mode) public static Silk.NET.OpenGL.Legacy.PolygonMode Convert(this GAL.PolygonMode mode)
{ {
switch (mode) switch (mode)
{ {
case GAL.PolygonMode.Point: case GAL.PolygonMode.Point:
return Silk.NET.OpenGL.PolygonMode.Point; return Silk.NET.OpenGL.Legacy.PolygonMode.Point;
case GAL.PolygonMode.Line: case GAL.PolygonMode.Line:
return Silk.NET.OpenGL.PolygonMode.Line; return Silk.NET.OpenGL.Legacy.PolygonMode.Line;
case GAL.PolygonMode.Fill: case GAL.PolygonMode.Fill:
return Silk.NET.OpenGL.PolygonMode.Fill; return Silk.NET.OpenGL.Legacy.PolygonMode.Fill;
} }
Logger.Debug?.Print(LogClass.Gpu, $"Invalid {nameof(GAL.PolygonMode)} enum value: {mode}."); Logger.Debug?.Print(LogClass.Gpu, $"Invalid {nameof(GAL.PolygonMode)} enum value: {mode}.");
return Silk.NET.OpenGL.PolygonMode.Fill; return Silk.NET.OpenGL.Legacy.PolygonMode.Fill;
} }
public static PrimitiveType Convert(this PrimitiveTopology topology) public static PrimitiveType Convert(this PrimitiveTopology topology)

2
src/Ryujinx.Graphics.OpenGL/FormatInfo.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
namespace Ryujinx.Graphics.OpenGL namespace Ryujinx.Graphics.OpenGL
{ {

2
src/Ryujinx.Graphics.OpenGL/FormatTable.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/Framebuffer.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using System; using System;
namespace Ryujinx.Graphics.OpenGL namespace Ryujinx.Graphics.OpenGL

2
src/Ryujinx.Graphics.OpenGL/Image/ImageArray.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
namespace Ryujinx.Graphics.OpenGL.Image namespace Ryujinx.Graphics.OpenGL.Image

2
src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
namespace Ryujinx.Graphics.OpenGL.Image namespace Ryujinx.Graphics.OpenGL.Image

2
src/Ryujinx.Graphics.OpenGL/Image/TextureArray.cs
View file

@ -1,5 +1,5 @@
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
namespace Ryujinx.Graphics.OpenGL.Image namespace Ryujinx.Graphics.OpenGL.Image
{ {

2
src/Ryujinx.Graphics.OpenGL/Image/TextureBase.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
namespace Ryujinx.Graphics.OpenGL.Image namespace Ryujinx.Graphics.OpenGL.Image

2
src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;
using System.Buffers; using System.Buffers;

2
src/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;

2
src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;
using System.Numerics; using System.Numerics;

2
src/Ryujinx.Graphics.OpenGL/Image/TextureStorage.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;

2
src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common; using Ryujinx.Common;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;

2
src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;

2
src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;

2
src/Ryujinx.Graphics.OpenGL/Pipeline.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Image; using Ryujinx.Graphics.OpenGL.Image;

2
src/Ryujinx.Graphics.OpenGL/Program.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Shader; using Ryujinx.Graphics.Shader;

2
src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

2
src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

2
src/Ryujinx.Graphics.OpenGL/Queries/CounterQueueEvent.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;
using System.Threading; using System.Threading;

2
src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
View file

@ -1,5 +1,5 @@
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using System; using System;
namespace Ryujinx.Graphics.OpenGL.Queries namespace Ryujinx.Graphics.OpenGL.Queries

1
src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
View file

@ -6,7 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Silk.NET.OpenGL" />
<PackageReference Include="Silk.NET.OpenGL.Legacy" /> <PackageReference Include="Silk.NET.OpenGL.Legacy" />
</ItemGroup> </ItemGroup>

2
src/Ryujinx.Graphics.OpenGL/Sync.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

2
src/Ryujinx.Graphics.OpenGL/VertexArray.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using System; using System;
using System.Numerics; using System.Numerics;

2
src/Ryujinx.Graphics.OpenGL/Window.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.GAL; using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.OpenGL.Effects; using Ryujinx.Graphics.OpenGL.Effects;
using Ryujinx.Graphics.OpenGL.Effects.Smaa; using Ryujinx.Graphics.OpenGL.Effects.Smaa;

2
src/Ryujinx.Gtk3/UI/OpenGLRenderer.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Input.HLE; using Ryujinx.Input.HLE;

2
src/Ryujinx.Gtk3/UI/SPBOpenGLContext.cs
View file

@ -1,4 +1,4 @@
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Graphics.OpenGL; using Ryujinx.Graphics.OpenGL;
using SPB.Graphics; using SPB.Graphics;
using SPB.Graphics.OpenGL; using SPB.Graphics.OpenGL;

2
src/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs
View file

@ -1,5 +1,5 @@
using OpenTK; using OpenTK;
using Silk.NET.OpenGL; using Silk.NET.OpenGL.Legacy;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.OpenGL; using Ryujinx.Graphics.OpenGL;