Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-06 00:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Fix possible NullReferenceExceptions, InvalidOperationExceptions

Browse Source
This commit is contained in:
KeatonTheBot
2025-10-06 11:48:21 -05:00
parent fa5b5b127e
commit 7a5b5dee6a
12 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.Graphics.GAL/ResourceLayout.cs
+1 -1
View File
@@ -147,7 +147,7 @@ namespace Ryujinx.Graphics.GAL
return false; return false;
} }
if (Descriptors != null) if (Descriptors != null && other.Descriptors != null)
{ {
if (Descriptors.Count != other.Descriptors.Count) if (Descriptors.Count != other.Descriptors.Count)
{ {
src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs
+32 -29
View File
@@ -240,44 +240,47 @@ namespace Ryujinx.Graphics.Vulkan
int dstOffset = 0; int dstOffset = 0;
bool activeRange = false; bool activeRange = false;
for (int i = 0; i < list.Count; i++) if (list != null)
{ {
var range = list[i]; for (int i = 0; i < list.Count; i++)
int rangeEnd = range.Offset + range.Size;
if (activeRange)
{ {
if (range.Offset >= endOffset) var range = list[i];
int rangeEnd = range.Offset + range.Size;
if (activeRange)
{ {
break; if (range.Offset >= endOffset)
{
break;
}
} }
} else
else
{
if (rangeEnd <= offset)
{ {
continue; if (rangeEnd <= offset)
{
continue;
}
activeRange = true;
} }
activeRange = true; int baseSize = range.Offset - srcOffset;
}
int baseSize = range.Offset - srcOffset; if (baseSize > 0)
{
baseData.Slice(dstOffset, baseSize).CopyTo(result.Slice(dstOffset, baseSize));
srcOffset += baseSize;
dstOffset += baseSize;
}
if (baseSize > 0) int modSize = Math.Min(rangeEnd - srcOffset, endOffset - srcOffset);
{ if (modSize != 0)
baseData.Slice(dstOffset, baseSize).CopyTo(result.Slice(dstOffset, baseSize)); {
srcOffset += baseSize; modData.Slice(dstOffset, modSize).CopyTo(result.Slice(dstOffset, modSize));
dstOffset += baseSize; srcOffset += modSize;
} dstOffset += modSize;
}
int modSize = Math.Min(rangeEnd - srcOffset, endOffset - srcOffset);
if (modSize != 0)
{
modData.Slice(dstOffset, modSize).CopyTo(result.Slice(dstOffset, modSize));
srcOffset += modSize;
dstOffset += modSize;
} }
} }
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
+5
View File
@@ -1691,6 +1691,11 @@ namespace Ryujinx.Graphics.Vulkan
return false; return false;
} }
if (_renderPass == null)
{
return true;
}
var pipeline = pbp == PipelineBindPoint.Compute var pipeline = pbp == PipelineBindPoint.Compute
? _newState.CreateComputePipeline(Gd, Device, _program, PipelineCache) ? _newState.CreateComputePipeline(Gd, Device, _program, PipelineCache)
: _newState.CreateGraphicsPipeline(Gd, Device, _program, PipelineCache, _renderPass.Get(Cbs).Value); : _newState.CreateGraphicsPipeline(Gd, Device, _program, PipelineCache, _renderPass.Get(Cbs).Value);
src/Ryujinx.Graphics.Vulkan/PipelineLayoutCache.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace Ryujinx.Graphics.Vulkan
return false; return false;
} }
if (SetDescriptors != null) if (SetDescriptors != null && other.SetDescriptors != null)
{ {
if (SetDescriptors.Count != other.SetDescriptors.Count) if (SetDescriptors.Count != other.SetDescriptors.Count)
{ {
src/Ryujinx.Graphics.Vulkan/PipelineLayoutCacheEntry.cs
+1 -1
View File
@@ -231,7 +231,7 @@ namespace Ryujinx.Graphics.Vulkan
private void FreeCompletedManualDescriptorSets() private void FreeCompletedManualDescriptorSets()
{ {
FenceHolder signalledFence = null; FenceHolder signalledFence = null;
while (_pendingManualDsConsumptions.TryPeek(out var pds) && (pds.Fence == signalledFence || pds.Fence.IsSignaled())) while (_pendingManualDsConsumptions.TryPeek(out var pds) && pds.Fence != null && (pds.Fence == signalledFence || pds.Fence.IsSignaled()))
{ {
signalledFence = pds.Fence; // Already checked - don't need to do it again. signalledFence = pds.Fence; // Already checked - don't need to do it again.
var dequeued = _pendingManualDsConsumptions.Dequeue(); var dequeued = _pendingManualDsConsumptions.Dequeue();
src/Ryujinx.Graphics.Vulkan/RenderPassHolder.cs
+9 -5
View File
@@ -134,14 +134,18 @@ namespace Ryujinx.Graphics.Vulkan
// Register this render pass with all render target views. // Register this render pass with all render target views.
var textures = fb.GetAttachmentViews(); if (fb != null)
foreach (var texture in textures)
{ {
texture.AddRenderPass(key, this); var textures = fb.GetAttachmentViews();
foreach (var texture in textures)
{
texture.AddRenderPass(key, this);
}
_textures = textures;
} }
_textures = textures;
_key = key; _key = key;
_forcedFences = []; _forcedFences = [];
src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+2 -2
View File
@@ -542,7 +542,7 @@ namespace Ryujinx.Graphics.Vulkan
pipeline.StagesCount = 1; pipeline.StagesCount = 1;
pipeline.PipelineLayout = PipelineLayout; pipeline.PipelineLayout = PipelineLayout;
pipeline.CreateComputePipeline(_gd, _device, this, (_gd.Pipeline as PipelineBase).PipelineCache); pipeline.CreateComputePipeline(_gd, _device, this, ((PipelineBase)_gd.Pipeline).PipelineCache);
pipeline.Dispose(); pipeline.Dispose();
} }
@@ -571,7 +571,7 @@ namespace Ryujinx.Graphics.Vulkan
pipeline.StagesCount = (uint)_shaders.Length; pipeline.StagesCount = (uint)_shaders.Length;
pipeline.PipelineLayout = PipelineLayout; pipeline.PipelineLayout = PipelineLayout;
pipeline.CreateGraphicsPipeline(_gd, _device, this, (_gd.Pipeline as PipelineBase).PipelineCache, renderPass.Value, throwOnError: true); pipeline.CreateGraphicsPipeline(_gd, _device, this, ((PipelineBase)_gd.Pipeline).PipelineCache, renderPass.Value, throwOnError: true);
pipeline.Dispose(); pipeline.Dispose();
} }
src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs
+1 -1
View File
@@ -266,7 +266,7 @@ namespace Ryujinx.Graphics.Vulkan
public void FreeCompleted() public void FreeCompleted()
{ {
FenceHolder signalledFence = null; FenceHolder signalledFence = null;
while (_pendingCopies.TryPeek(out var pc) && (pc.Fence == signalledFence || pc.Fence.IsSignaled())) while (_pendingCopies.TryPeek(out var pc) && pc.Fence != null && (pc.Fence == signalledFence || pc.Fence.IsSignaled()))
{ {
signalledFence = pc.Fence; // Already checked - don't need to do it again. signalledFence = pc.Fence; // Already checked - don't need to do it again.
var dequeued = _pendingCopies.Dequeue(); var dequeued = _pendingCopies.Dequeue();
src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs
+1 -1
View File
@@ -1099,7 +1099,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator
} }
if (!IPAddress.TryParse(ldnServer, out IPAddress ipAddress)) if (!IPAddress.TryParse(ldnServer, out IPAddress ipAddress))
{ {
ipAddress = Dns.GetHostEntry(ldnServer).AddressList[0]; ipAddress = Dns.GetHostEntry(ldnServer ?? string.Empty).AddressList[0];
} }
NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), LanPlayPort, context.Device.Configuration); NetworkClient = new LdnMasterProxyClient(ipAddress.ToString(), LanPlayPort, context.Device.Configuration);
} }
src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs
+2 -2
View File
@@ -267,7 +267,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
// Attempt to find matching configuration. If we don't find one, wait for a bit and try again. // Attempt to find matching configuration. If we don't find one, wait for a bit and try again.
// Woken by new tokens coming in from the master server. // Woken by new tokens coming in from the master server.
IPAddress address = (session.Socket.RemoteEndPoint as IPEndPoint).Address; IPAddress address = (session.Socket.RemoteEndPoint as IPEndPoint)?.Address;
byte[] addressBytes = ProxyHelpers.AddressTo16Byte(address); byte[] addressBytes = ProxyHelpers.AddressTo16Byte(address);
long time; long time;
@@ -282,7 +282,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
// Allow any client that has a private IP to connect. (indicated by the server as all 0 in the token) // Allow any client that has a private IP to connect. (indicated by the server as all 0 in the token)
bool isPrivate = waitToken.PhysicalIp.AsSpan().SequenceEqual(new byte[16]); bool isPrivate = waitToken.PhysicalIp.AsSpan().SequenceEqual(new byte[16]);
bool ipEqual = isPrivate || waitToken.AddressFamily == address.AddressFamily && waitToken.PhysicalIp.AsSpan().SequenceEqual(addressBytes); bool ipEqual = address != null && (isPrivate || waitToken.AddressFamily == address.AddressFamily && waitToken.PhysicalIp.AsSpan().SequenceEqual(addressBytes));
if (ipEqual && waitToken.Token.AsSpan().SequenceEqual(config.Token.AsSpan())) if (ipEqual && waitToken.Token.AsSpan().SequenceEqual(config.Token.AsSpan()))
{ {
src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
+4 -1
View File
@@ -37,7 +37,10 @@ namespace Ryujinx.Ava.UI.Controls
private void SearchBox_OnKeyUp(object sender, KeyEventArgs args) private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
{ {
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox)?.Text; if (DataContext is MainWindowViewModel model)
{
model.SearchText = (sender as TextBox)?.Text;
}
} }
} }
} }
src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+4 -1
View File
@@ -38,7 +38,10 @@ namespace Ryujinx.Ava.UI.Controls
private void SearchBox_OnKeyUp(object sender, KeyEventArgs args) private void SearchBox_OnKeyUp(object sender, KeyEventArgs args)
{ {
(DataContext as MainWindowViewModel).SearchText = (sender as TextBox)?.Text; if (DataContext is MainWindowViewModel model)
{
model.SearchText = (sender as TextBox)?.Text;
}
} }
private async void IdString_OnClick(object sender, RoutedEventArgs e) private async void IdString_OnClick(object sender, RoutedEventArgs e)