diff --git a/Directory.Packages.props b/Directory.Packages.props
index b1200f9b5..afb81c2fa 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -26,12 +26,12 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
index 180379bfd..8c12ddcae 100644
--- a/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
@@ -553,7 +553,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
level,
x,
width,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -580,7 +580,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
layer,
width,
1,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -609,7 +609,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
y,
width,
height,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -642,7 +642,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
width,
height,
1,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -673,7 +673,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
y,
width,
height,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -741,7 +741,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
level,
0,
width,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -769,7 +769,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
0,
width,
height,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -802,7 +802,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
width,
height,
depth,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize,
data);
}
@@ -837,7 +837,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
0,
width,
height,
- format.PixelFormat,
+ (InternalFormat)format.PixelFormat,
mipSize / 6,
data + faceOffset);
}
diff --git a/src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs b/src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
index ebfe3ad64..684a03e9f 100644
--- a/src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
+++ b/src/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
@@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.OpenGL
public void Map(BufferHandle handle, int size)
{
GL.BindBuffer(BufferTarget.CopyWriteBuffer, handle.ToInt32());
- IntPtr ptr = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, IntPtr.Zero, size, BufferAccessMask.MapReadBit | BufferAccessMask.MapPersistentBit);
+ IntPtr ptr = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, IntPtr.Zero, size, MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapPersistentBit);
_maps[handle] = ptr;
}
@@ -75,7 +75,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.BindBuffer(BufferTarget.CopyWriteBuffer, _copyBufferHandle);
GL.BufferStorage(BufferTarget.CopyWriteBuffer, requiredSize, IntPtr.Zero, BufferStorageFlags.MapReadBit | BufferStorageFlags.MapPersistentBit);
- _bufferMap = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, IntPtr.Zero, requiredSize, BufferAccessMask.MapReadBit | BufferAccessMask.MapPersistentBit);
+ _bufferMap = GL.MapBufferRange(BufferTarget.CopyWriteBuffer, IntPtr.Zero, requiredSize, MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapPersistentBit);
}
}
diff --git a/src/Ryujinx.Graphics.OpenGL/Pipeline.cs b/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
index 4fb094539..a51a1683b 100644
--- a/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
@@ -925,7 +925,7 @@ namespace Ryujinx.Graphics.OpenGL
return;
}
- GL.CullFace(face.Convert());
+ GL.CullFace((TriangleFace)face.Convert());
GL.Enable(EnableCap.CullFace);
}
@@ -960,7 +960,7 @@ namespace Ryujinx.Graphics.OpenGL
public void SetImageArray(ShaderStage stage, int binding, IImageArray array)
{
- (array as ImageArray).Bind(binding);
+ (array as ImageArray)?.Bind(binding);
}
public void SetImageArraySeparate(ShaderStage stage, int setIndex, IImageArray array)
@@ -1085,12 +1085,12 @@ namespace Ryujinx.Graphics.OpenGL
{
if (frontMode == backMode)
{
- GL.PolygonMode(MaterialFace.FrontAndBack, frontMode.Convert());
+ GL.PolygonMode(TriangleFace.FrontAndBack, frontMode.Convert());
}
else
{
- GL.PolygonMode(MaterialFace.Front, frontMode.Convert());
- GL.PolygonMode(MaterialFace.Back, backMode.Convert());
+ GL.PolygonMode(TriangleFace.Front, frontMode.Convert());
+ GL.PolygonMode(TriangleFace.Back, backMode.Convert());
}
}
@@ -1314,7 +1314,7 @@ namespace Ryujinx.Graphics.OpenGL
public void SetTextureArray(ShaderStage stage, int binding, ITextureArray array)
{
- (array as TextureArray).Bind(binding);
+ (array as TextureArray)?.Bind(binding);
}
public void SetTextureArraySeparate(ShaderStage stage, int setIndex, ITextureArray array)
diff --git a/src/Ryujinx.Graphics.OpenGL/Program.cs b/src/Ryujinx.Graphics.OpenGL/Program.cs
index 19de06f8f..fd5675dc1 100644
--- a/src/Ryujinx.Graphics.OpenGL/Program.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Program.cs
@@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.CompileShader(shaderHandle);
break;
case TargetLanguage.Spirv:
- GL.ShaderBinary(1, ref shaderHandle, (BinaryFormat)All.ShaderBinaryFormatSpirVArb, shader.BinaryCode, shader.BinaryCode.Length);
+ GL.ShaderBinary(1, ref shaderHandle, (ShaderBinaryFormat)All.ShaderBinaryFormatSpirVArb, shader.BinaryCode, shader.BinaryCode.Length);
GL.SpecializeShader(shaderHandle, "main", 0, (int[])null, (int[])null);
break;
}
diff --git a/src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs b/src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs
index 0a85970d7..7a2bda732 100644
--- a/src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Queries/BufferedQuery.cs
@@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.OpenGL.Queries
long defaultValue = DefaultValue;
GL.BufferStorage(BufferTarget.QueryBuffer, sizeof(long), (IntPtr)(&defaultValue), BufferStorageFlags.MapReadBit | BufferStorageFlags.MapWriteBit | BufferStorageFlags.MapPersistentBit);
}
- _bufferMap = GL.MapBufferRange(BufferTarget.QueryBuffer, IntPtr.Zero, sizeof(long), BufferAccessMask.MapReadBit | BufferAccessMask.MapWriteBit | BufferAccessMask.MapPersistentBit);
+ _bufferMap = GL.MapBufferRange(BufferTarget.QueryBuffer, IntPtr.Zero, sizeof(long), MapBufferAccessMask.MapReadBit | MapBufferAccessMask.MapWriteBit | MapBufferAccessMask.MapPersistentBit);
}
public void Reset()
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index b6ca5f8a1..4283aecd3 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -51,7 +51,7 @@
-
+