mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-06-28 21:56:24 +02:00
misc: chore: Use explicit types in Vulkan project
This commit is contained in:
parent
e6b393e420
commit
2d1a4c3ce5
58 changed files with 682 additions and 667 deletions
|
@ -2,6 +2,7 @@ using Ryujinx.Graphics.GAL;
|
|||
using Silk.NET.Vulkan;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Format = Ryujinx.Graphics.GAL.Format;
|
||||
using VkFormat = Silk.NET.Vulkan.Format;
|
||||
|
||||
namespace Ryujinx.Graphics.Vulkan
|
||||
|
@ -33,7 +34,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
|
||||
public FramebufferParams(Device device, TextureView view, uint width, uint height)
|
||||
{
|
||||
var format = view.Info.Format;
|
||||
Format format = view.Info.Format;
|
||||
|
||||
bool isDepthStencil = format.IsDepthOrStencil();
|
||||
|
||||
|
@ -96,7 +97,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
{
|
||||
if (IsValidTextureView(color))
|
||||
{
|
||||
var texture = (TextureView)color;
|
||||
TextureView texture = (TextureView)color;
|
||||
|
||||
_attachments[index] = texture.GetImageViewForAttachment();
|
||||
_colors[index] = texture;
|
||||
|
@ -107,7 +108,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
AttachmentFormats[index] = texture.VkFormat;
|
||||
AttachmentIndices[index] = bindIndex;
|
||||
|
||||
var format = texture.Info.Format;
|
||||
Format format = texture.Info.Format;
|
||||
|
||||
if (format.IsInteger())
|
||||
{
|
||||
|
@ -184,7 +185,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
{
|
||||
if (_colors != null && (uint)index < _colors.Length)
|
||||
{
|
||||
var format = _colors[index].Info.Format;
|
||||
Format format = _colors[index].Info.Format;
|
||||
|
||||
if (format.IsSint())
|
||||
{
|
||||
|
@ -239,7 +240,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
attachments[i] = _attachments[i].Get(cbs).Value;
|
||||
}
|
||||
|
||||
var framebufferCreateInfo = new FramebufferCreateInfo
|
||||
FramebufferCreateInfo framebufferCreateInfo = new FramebufferCreateInfo
|
||||
{
|
||||
SType = StructureType.FramebufferCreateInfo,
|
||||
RenderPass = renderPass.Get(cbs).Value,
|
||||
|
@ -250,13 +251,13 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
Layers = Layers,
|
||||
};
|
||||
|
||||
api.CreateFramebuffer(_device, in framebufferCreateInfo, null, out var framebuffer).ThrowOnError();
|
||||
api.CreateFramebuffer(_device, in framebufferCreateInfo, null, out Framebuffer framebuffer).ThrowOnError();
|
||||
return new Auto<DisposableFramebuffer>(new DisposableFramebuffer(api, _device, framebuffer), null, _attachments);
|
||||
}
|
||||
|
||||
public TextureView[] GetAttachmentViews()
|
||||
{
|
||||
var result = new TextureView[_attachments.Length];
|
||||
TextureView[] result = new TextureView[_attachments.Length];
|
||||
|
||||
_colors?.CopyTo(result, 0);
|
||||
|
||||
|
@ -277,7 +278,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
{
|
||||
if (_colors != null)
|
||||
{
|
||||
foreach (var color in _colors)
|
||||
foreach (TextureView color in _colors)
|
||||
{
|
||||
// If Clear or DontCare were used, this would need to be write bit.
|
||||
color.Storage?.QueueLoadOpBarrier(cbs, false);
|
||||
|
@ -293,7 +294,7 @@ namespace Ryujinx.Graphics.Vulkan
|
|||
{
|
||||
if (_colors != null)
|
||||
{
|
||||
foreach (var color in _colors)
|
||||
foreach (TextureView color in _colors)
|
||||
{
|
||||
color.Storage?.AddStoreOpUsage(false);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue