owen/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryubing/Ryujinx.git synced 2025-11-30 15:52:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Use explicit types in Vulkan project

Browse Source
This commit is contained in:
Evan Husted
2025-01-25 14:12:17 -06:00
parent e6b393e420
commit 2d1a4c3ce5
58 changed files with 682 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Ryujinx.Graphics.Vulkan/PersistentFlushBuffer.cs
View File

@@ -1,5 +1,7 @@
using Ryujinx.Graphics.GAL;
using Silk.NET.Vulkan;
using System;
using Buffer = Silk.NET.Vulkan.Buffer;
namespace Ryujinx.Graphics.Vulkan
{
@@ -16,7 +18,7 @@ namespace Ryujinx.Graphics.Vulkan
private BufferHolder ResizeIfNeeded(int size)
{
var flushStorage = _flushStorage;
BufferHolder flushStorage = _flushStorage;
if (flushStorage == null || size > _flushStorage.Size)
{
@@ -31,13 +33,13 @@ namespace Ryujinx.Graphics.Vulkan
public Span<byte> GetBufferData(CommandBufferPool cbp, BufferHolder buffer, int offset, int size)
{
var flushStorage = ResizeIfNeeded(size);
BufferHolder flushStorage = ResizeIfNeeded(size);
Auto<DisposableBuffer> srcBuffer;
using (var cbs = cbp.Rent())
using (CommandBufferScoped cbs = cbp.Rent())
{
srcBuffer = buffer.GetBuffer(cbs.CommandBuffer);
var dstBuffer = flushStorage.GetBuffer(cbs.CommandBuffer);
Auto<DisposableBuffer> dstBuffer = flushStorage.GetBuffer(cbs.CommandBuffer);
if (srcBuffer.TryIncrementReferenceCount())
{
@@ -59,12 +61,12 @@ namespace Ryujinx.Graphics.Vulkan
{
TextureCreateInfo info = view.Info;
var flushStorage = ResizeIfNeeded(size);
BufferHolder flushStorage = ResizeIfNeeded(size);
using (var cbs = cbp.Rent())
using (CommandBufferScoped cbs = cbp.Rent())
{
var buffer = flushStorage.GetBuffer(cbs.CommandBuffer).Get(cbs).Value;
var image = view.GetImage().Get(cbs).Value;
Buffer buffer = flushStorage.GetBuffer(cbs.CommandBuffer).Get(cbs).Value;
Image image = view.GetImage().Get(cbs).Value;
view.CopyFromOrToBuffer(cbs.CommandBuffer, buffer, image, size, true, 0, 0, info.GetLayers(), info.Levels, singleSlice: false);
}
@@ -75,12 +77,12 @@ namespace Ryujinx.Graphics.Vulkan
public Span<byte> GetTextureData(CommandBufferPool cbp, TextureView view, int size, int layer, int level)
{
var flushStorage = ResizeIfNeeded(size);
BufferHolder flushStorage = ResizeIfNeeded(size);
using (var cbs = cbp.Rent())
using (CommandBufferScoped cbs = cbp.Rent())
{
var buffer = flushStorage.GetBuffer(cbs.CommandBuffer).Get(cbs).Value;
var image = view.GetImage().Get(cbs).Value;
Buffer buffer = flushStorage.GetBuffer(cbs.CommandBuffer).Get(cbs).Value;
Image image = view.GetImage().Get(cbs).Value;
view.CopyFromOrToBuffer(cbs.CommandBuffer, buffer, image, size, true, layer, level, 1, 1, singleSlice: true);
}