mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

General cleanup, OGL fix

Browse source
This commit is contained in:
riperiperi 2024-05-14 01:23:12 +01:00
parent 5d0097f7ec
commit 7234f371b5
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeState.cs
View file

@ -3,6 +3,7 @@ using Ryujinx.Common.Logging;
using Ryujinx.Graphics.GAL;
using Ryujinx.Graphics.Gpu.Engine.Types;
using Ryujinx.Graphics.Gpu.Image;
using Ryujinx.Graphics.Gpu.Memory;
using Ryujinx.Graphics.Gpu.Shader;
using Ryujinx.Graphics.Shader;
using Ryujinx.Graphics.Shader.Translation;
@ -370,7 +371,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
{
var memoryManager = _channel.MemoryManager;
BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address, size), Gpu.Memory.BufferStage.VertexBuffer);
BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address, size), BufferStage.VertexBuffer);
ITexture bufferTexture = _vacContext.EnsureBufferTexture(index + 2, format);
bufferTexture.SetStorage(range);

8
src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
View file

@ -178,6 +178,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
_virtualDependenciesLock = new ReaderWriterLockSlim();
}
/// <summary>
/// Recreates the backing buffer based on the desired access type
/// reported by the backing state struct.
/// </summary>
private void ChangeBacking()
{
BufferAccess access = BackingState.SwitchAccess(this);
@ -193,6 +197,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
_preFlush = null;
Handle = newHandle;
_physicalMemory.BufferCache.BufferBackingChanged(this);
}
/// <summary>
@ -381,8 +387,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
if (BackingState.ShouldChangeBacking())
{
ChangeBacking();
_physicalMemory.BufferCache.BufferBackingChanged(this);
}
if (BackingState.IsDeviceLocal)

8
src/Ryujinx.Graphics.Gpu/Memory/BufferBackingState.cs
View file

@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
if (_canSwap)
{
// Might want to start certain buffers as being device local,
// and the usage might also _lock_ those buffers into being device local.
// and the usage might also lock those buffers into being device local.
BufferStage storageFlags = stage & BufferStage.StorageMask;
@ -86,7 +86,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
}
// TODO: atomic access should likely always be device local
// TODO: Might be nice to force atomic access to be device local for any stage.
}
if (baseBuffers != null)
@ -99,7 +99,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
}
}
private BufferBackingType CombineTypes(BufferBackingType left, BufferBackingType right)
private static BufferBackingType CombineTypes(BufferBackingType left, BufferBackingType right)
{
return (BufferBackingType)Math.Max((int)left, (int)right);
}
@ -192,7 +192,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
_desiredType = CombineTypes(_desiredType, BufferBackingType.DeviceMemory);
_deviceLocalForceCount = DeviceLocalForceExpiry;
// TODO: atomic access should likely always be device local
// TODO: Might be nice to force atomic access to be device local for any stage.
}
}

7
src/Ryujinx.Graphics.Gpu/Memory/BufferStage.cs
View file

@ -3,6 +3,10 @@ using System.Runtime.CompilerServices;
namespace Ryujinx.Graphics.Gpu.Memory
{
/// <summary>
/// Pipeline stages that can modify buffer data, as well as flags indicating storage usage.
/// Must match ShaderStage for the shader stages, though anything after that can be in any order.
/// </summary>
internal enum BufferStage : byte
{
Compute,
@ -31,6 +35,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
#pragma warning restore CA1069 // Enums values should not be duplicated
}
/// <summary>
/// Utility methods to convert shader stages and binding flags into buffer stages.
/// </summary>
internal static class BufferStageUtils
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]

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

@ -61,7 +61,9 @@ namespace Ryujinx.Graphics.OpenGL
{
BufferCount++;
if (access.HasFlag(GAL.BufferAccess.HostMemory))
var memType = access & GAL.BufferAccess.MemoryTypeMask;
if (memType == GAL.BufferAccess.HostMemory)
{
BufferHandle handle = Buffer.CreatePersistent(size);