N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve missed changes

Browse source
This commit is contained in:
sunshineinabox 2024-09-01 18:47:06 -07:00
parent 6464f97973
commit 3f900e6fa0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
View file

@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Vulkan
PrimitiveRestart = 1 << 15, PrimitiveRestart = 1 << 15,
PrimitiveTopology = 1 << 16, PrimitiveTopology = 1 << 16,
DepthBiasEnable = 1 << 17, DepthBiasEnable = 1 << 17,
Standard = Blend | DepthBias | Scissor | Stencil | Viewport | FeedbackLoop, Standard = Blend | DepthBias | Scissor | Stencil | Viewport | FeedbackLoop,
Extended = CullMode | FrontFace | DepthTestBool | DepthTestCompareOp | StencilTestEnableandStencilOp | PrimitiveTopology, Extended = CullMode | FrontFace | DepthTestBool | DepthTestCompareOp | StencilTestEnableandStencilOp | PrimitiveTopology,
Extended2 = RasterDiscard | PrimitiveRestart | DepthBiasEnable, Extended2 = RasterDiscard | PrimitiveRestart | DepthBiasEnable,
} }
@ -276,7 +276,7 @@ namespace Ryujinx.Graphics.Vulkan
public void ReplayIfDirty(VulkanRenderer gd, CommandBuffer commandBuffer) public void ReplayIfDirty(VulkanRenderer gd, CommandBuffer commandBuffer)
{ {
Vk api = gd.Api; _ = gd.Api;
if (_dirty.HasFlag(DirtyFlags.Blend)) if (_dirty.HasFlag(DirtyFlags.Blend))
{ {

10
src/Ryujinx.Graphics.Vulkan/PipelineState.cs
View file

@ -242,8 +242,8 @@ namespace Ryujinx.Graphics.Vulkan
public FeedbackLoopAspects FeedbackLoopAspects public FeedbackLoopAspects FeedbackLoopAspects
{ {
readonly get => (FeedbackLoopAspects)((Internal.Id8 >> 7) & 0x3); readonly get => (FeedbackLoopAspects)((Internal.Id3 >> 7) & 0x3);
set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFE7F) | (((ulong)value) << 7); set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFE7F) | (((ulong)value) << 7);
} }
public bool HasTessellationControlShader; public bool HasTessellationControlShader;
@ -578,8 +578,8 @@ namespace Ryujinx.Graphics.Vulkan
bool supportsFeedbackLoopDynamicState = gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop; bool supportsFeedbackLoopDynamicState = gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop;
DynamicState* dynamicStates = stackalloc DynamicState[MaxDynamicStatesCount]; DynamicState* dynamicStates = stackalloc DynamicState[MaxDynamicStatesCount];
int dynamicStatesCount = 7; uint dynamicStatesCount = 7;
dynamicStates[0] = DynamicState.Viewport; dynamicStates[0] = DynamicState.Viewport;
dynamicStates[1] = DynamicState.Scissor; dynamicStates[1] = DynamicState.Scissor;
@ -639,7 +639,7 @@ namespace Ryujinx.Graphics.Vulkan
var pipelineDynamicStateCreateInfo = new PipelineDynamicStateCreateInfo var pipelineDynamicStateCreateInfo = new PipelineDynamicStateCreateInfo
{ {
SType = StructureType.PipelineDynamicStateCreateInfo, SType = StructureType.PipelineDynamicStateCreateInfo,
DynamicStateCount = currentIndex, DynamicStateCount = dynamicStatesCount,
PDynamicStates = dynamicStates, PDynamicStates = dynamicStates,
}; };