ShuriZma
/
Ryujinx
mirror of https://github.com/Ryujinx/Ryujinx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Correct namespace

This commit is contained in:
sunshineinabox 2024-05-16 21:22:43 -07:00
parent 506f25054d
commit e7fbc9a1be
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
View File

@ -1645,7 +1645,7 @@ namespace Ryujinx.Graphics.Vulkan
Gd.FlushAllCommands(); Gd.FlushAllCommands();
} }
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer); DynamicState.ReplayIfDirty(Gd, CommandBuffer);
if (_needsIndexBufferRebind && _indexBufferPattern == null) if (_needsIndexBufferRebind && _indexBufferPattern == null)
{ {

39
src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
View File

@ -1,5 +1,6 @@
using Ryujinx.Common.Memory; using Ryujinx.Common.Memory;
using Silk.NET.Vulkan; using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.EXT;
using System; using System;
namespace Ryujinx.Graphics.Vulkan namespace Ryujinx.Graphics.Vulkan
@ -220,66 +221,66 @@ namespace Ryujinx.Graphics.Vulkan
} }
} }
public void ReplayIfDirty(Vk api, CommandBuffer commandBuffer) public void ReplayIfDirty(VulkanRenderer gd, CommandBuffer commandBuffer)
{ {
if (_dirty.HasFlag(DirtyFlags.Blend)) if (_dirty.HasFlag(DirtyFlags.Blend))
{ {
RecordBlend(api, commandBuffer); RecordBlend(gd.Api, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.DepthBias)) if (_dirty.HasFlag(DirtyFlags.DepthBias))
{ {
RecordDepthBias(api, commandBuffer); RecordDepthBias(gd.Api, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.Scissor)) if (_dirty.HasFlag(DirtyFlags.Scissor))
{ {
RecordScissor(api, commandBuffer); RecordScissor(gd.Api, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.Stencil)) if (_dirty.HasFlag(DirtyFlags.Stencil))
{ {
RecordStencil(api, commandBuffer); RecordStencil(gd.Api, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.Viewport)) if (_dirty.HasFlag(DirtyFlags.Viewport))
{ {
RecordViewport(api, commandBuffer); RecordViewport(gd.Api, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.CullMode)) if (_dirty.HasFlag(DirtyFlags.CullMode))
{ {
RecordCullMode(api, commandBuffer); RecordCullMode(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.FrontFace)) if (_dirty.HasFlag(DirtyFlags.FrontFace))
{ {
RecordFrontFace(api, commandBuffer); RecordFrontFace(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.DepthTestBool)) if (_dirty.HasFlag(DirtyFlags.DepthTestBool))
{ {
RecordDepthTestBool(api, commandBuffer); RecordDepthTestBool(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.DepthTestCompareOp)) if (_dirty.HasFlag(DirtyFlags.DepthTestCompareOp))
{ {
RecordDepthTestCompareOp(api, commandBuffer); RecordDepthTestCompareOp(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.StencilTestEnable)) if (_dirty.HasFlag(DirtyFlags.StencilTestEnable))
{ {
RecordStencilTestEnable(api, commandBuffer); RecordStencilTestEnable(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.Toplogy)) if (_dirty.HasFlag(DirtyFlags.Toplogy))
{ {
RecordPrimitiveTopology(api, commandBuffer); RecordPrimitiveTopology(gd.ExtendedDynamicStateApi, commandBuffer);
} }
if (_dirty.HasFlag(DirtyFlags.LineWidth)) if (_dirty.HasFlag(DirtyFlags.LineWidth))
{ {
RecordLineWidth(api, commandBuffer); RecordLineWidth(gd.Api, commandBuffer);
} }
_dirty = DirtyFlags.None; _dirty = DirtyFlags.None;
@ -321,7 +322,7 @@ namespace Ryujinx.Graphics.Vulkan
api.CmdSetStencilReference(commandBuffer, StencilFaceFlags.FaceFrontBit, _frontReference); api.CmdSetStencilReference(commandBuffer, StencilFaceFlags.FaceFrontBit, _frontReference);
} }
private readonly void RecordStencilTestEnable(Vk api, CommandBuffer commandBuffer) private readonly void RecordStencilTestEnable(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetStencilTestEnable(commandBuffer, _stencilTestEnable); api.CmdSetStencilTestEnable(commandBuffer, _stencilTestEnable);
} }
@ -334,28 +335,28 @@ namespace Ryujinx.Graphics.Vulkan
} }
} }
private void RecordCullMode(Vk api, CommandBuffer commandBuffer) private void RecordCullMode(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetCullMode(commandBuffer, CullMode); api.CmdSetCullMode(commandBuffer, CullMode);
} }
private void RecordFrontFace(Vk api, CommandBuffer commandBuffer) private void RecordFrontFace(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetFrontFace(commandBuffer, FrontFace); api.CmdSetFrontFace(commandBuffer, FrontFace);
} }
private void RecordDepthTestBool(Vk api, CommandBuffer commandBuffer) private void RecordDepthTestBool(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetDepthTestEnable(commandBuffer, _depthtestEnable); api.CmdSetDepthTestEnable(commandBuffer, _depthtestEnable);
api.CmdSetDepthWriteEnable(commandBuffer, _depthwriteEnable); api.CmdSetDepthWriteEnable(commandBuffer, _depthwriteEnable);
} }
private void RecordDepthTestCompareOp(Vk api, CommandBuffer commandBuffer) private void RecordDepthTestCompareOp(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetDepthCompareOp(commandBuffer, _depthCompareOp); api.CmdSetDepthCompareOp(commandBuffer, _depthCompareOp);
} }
private void RecordPrimitiveTopology(Vk api, CommandBuffer commandBuffer) private void RecordPrimitiveTopology(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
{ {
api.CmdSetPrimitiveTopology(commandBuffer, Topology); api.CmdSetPrimitiveTopology(commandBuffer, Topology);
} }

2
src/Ryujinx.Graphics.Vulkan/PipelineFull.cs
View File

@ -233,7 +233,7 @@ namespace Ryujinx.Graphics.Vulkan
if (Pipeline != null && Pbp == PipelineBindPoint.Graphics) if (Pipeline != null && Pbp == PipelineBindPoint.Graphics)
{ {
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer); DynamicState.ReplayIfDirty(Gd, CommandBuffer);
} }
} }