Compare commits

...

2 Commits

Author SHA1 Message Date
Marco Carvalho
22fb8c9d4f Update to new standard for volatility operations (#6682) 2024-04-19 09:03:52 -03:00
gdkchan
2f93ae9a19 Fix unmapped address check when reading texture handles (#6679) 2024-04-18 19:28:16 -03:00
3 changed files with 8 additions and 8 deletions

View File

@@ -770,7 +770,7 @@ namespace Ryujinx.Graphics.Gpu.Image
? _channel.BufferManager.GetComputeUniformBufferAddress(textureBufferIndex)
: _channel.BufferManager.GetGraphicsUniformBufferAddress(stageIndex, textureBufferIndex);
int handle = textureBufferAddress != 0
int handle = textureBufferAddress != MemoryManager.PteUnmapped
? _channel.MemoryManager.Physical.Read<int>(textureBufferAddress + (uint)textureWordOffset * 4)
: 0;
@@ -790,7 +790,7 @@ namespace Ryujinx.Graphics.Gpu.Image
? _channel.BufferManager.GetComputeUniformBufferAddress(samplerBufferIndex)
: _channel.BufferManager.GetGraphicsUniformBufferAddress(stageIndex, samplerBufferIndex);
samplerHandle = samplerBufferAddress != 0
samplerHandle = samplerBufferAddress != MemoryManager.PteUnmapped
? _channel.MemoryManager.Physical.Read<int>(samplerBufferAddress + (uint)samplerWordOffset * 4)
: 0;
}

View File

@@ -143,7 +143,7 @@ namespace Ryujinx.HLE.HOS
try
{
ControllerKeys pressedKeys = (ControllerKeys)Thread.VolatileRead(ref _pressedKeys);
ControllerKeys pressedKeys = (ControllerKeys)Volatile.Read(ref _pressedKeys);
program.Process.TamperedCodeMemory = false;
program.Execute(pressedKeys);
@@ -175,14 +175,14 @@ namespace Ryujinx.HLE.HOS
{
if (input.PlayerId == PlayerIndex.Player1 || input.PlayerId == PlayerIndex.Handheld)
{
Thread.VolatileWrite(ref _pressedKeys, (long)input.Buttons);
Volatile.Write(ref _pressedKeys, (long)input.Buttons);
return;
}
}
// Clear the input because player one is not conected.
Thread.VolatileWrite(ref _pressedKeys, 0);
Volatile.Write(ref _pressedKeys, 0);
}
}
}

View File

@@ -388,14 +388,14 @@ namespace Ryujinx.Tests.Memory
{
rwLock.AcquireReaderLock();
int originalValue = Thread.VolatileRead(ref value);
int originalValue = Volatile.Read(ref value);
count++;
// Spin a bit.
for (int i = 0; i < 100; i++)
{
if (Thread.VolatileRead(ref readersAllowed) == 0)
if (Volatile.Read(ref readersAllowed) == 0)
{
error = true;
running = false;
@@ -403,7 +403,7 @@ namespace Ryujinx.Tests.Memory
}
// Should not change while the lock is held.
if (Thread.VolatileRead(ref value) != originalValue)
if (Volatile.Read(ref value) != originalValue)
{
error = true;
running = false;