mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use BitUtils instead of IntUtils

Browse source
This commit is contained in:
Ac_K 2019-09-20 00:45:56 +02:00
commit 010d57911e
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/EdgeMatrix.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.HLE.Utilities; using Ryujinx.Common;
namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{ {
@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{ {
public static int GetWorkBufferSize(int totalMixCount) public static int GetWorkBufferSize(int totalMixCount)
{ {
int size = IntUtils.AlignUp(totalMixCount * totalMixCount, AudioRendererConsts.BufferAlignment); int size = BitUtils.AlignUp(totalMixCount * totalMixCount, AudioRendererConsts.BufferAlignment);
if (size < 0) if (size < 0)
{ {

4
Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/NodeStates.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.HLE.Utilities; using Ryujinx.Common;
namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{ {
@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{ {
public static long GetWorkBufferSize(int totalMixCount) public static long GetWorkBufferSize(int totalMixCount)
{ {
int size = IntUtils.AlignUp(totalMixCount, AudioRendererConsts.BufferAlignment); int size = BitUtils.AlignUp(totalMixCount, AudioRendererConsts.BufferAlignment);
if (size < 0) if (size < 0)
{ {

4
Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/SplitterContext.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.HLE.Utilities; using Ryujinx.Common;
namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{ {
@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
if (!behaviorInfo.IsSplitterBugFixed()) if (!behaviorInfo.IsSplitterBugFixed())
{ {
size += IntUtils.AlignUp(4 * parameters.SplitterDestinationDataCount, 16); size += BitUtils.AlignUp(4 * parameters.SplitterDestinationDataCount, 16);
} }
return size; return size;

14
Ryujinx.HLE/HOS/Services/Audio/IAudioRendererManager.cs
View file

@ -1,7 +1,7 @@
using Ryujinx.Audio; using Ryujinx.Audio;
using Ryujinx.Common;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager; using Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager;
using Ryujinx.HLE.Utilities;
namespace Ryujinx.HLE.HOS.Services.Audio namespace Ryujinx.HLE.HOS.Services.Audio
{ {
@ -44,13 +44,13 @@ namespace Ryujinx.HLE.HOS.Services.Audio
int totalMixCount = parameters.SubMixCount + 1; int totalMixCount = parameters.SubMixCount + 1;
size = IntUtils.AlignUp(parameters.MixBufferCount * 4, AudioRendererConsts.BufferAlignment) + size = BitUtils.AlignUp(parameters.MixBufferCount * 4, AudioRendererConsts.BufferAlignment) +
parameters.SubMixCount * 0x400 + parameters.SubMixCount * 0x400 +
totalMixCount * 0x940 + totalMixCount * 0x940 +
parameters.VoiceCount * 0x3F0 + parameters.VoiceCount * 0x3F0 +
IntUtils.AlignUp(totalMixCount * 8, 16) + BitUtils.AlignUp(totalMixCount * 8, 16) +
IntUtils.AlignUp(parameters.VoiceCount * 8, 16) + BitUtils.AlignUp(parameters.VoiceCount * 8, 16) +
IntUtils.AlignUp(((parameters.SinkCount + parameters.SubMixCount) * 0x3C0 + parameters.SampleCount * 4) * BitUtils.AlignUp(((parameters.SinkCount + parameters.SubMixCount) * 0x3C0 + parameters.SampleCount * 4) *
(parameters.MixBufferCount + 6), AudioRendererConsts.BufferAlignment) + (parameters.MixBufferCount + 6), AudioRendererConsts.BufferAlignment) +
(parameters.SinkCount + parameters.SubMixCount) * 0x2C0 + (parameters.SinkCount + parameters.SubMixCount) * 0x2C0 +
(parameters.EffectCount + parameters.VoiceCount * 4) * 0x30 + (parameters.EffectCount + parameters.VoiceCount * 4) * 0x30 +
@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
if (behaviorInfo.IsSplitterSupported()) if (behaviorInfo.IsSplitterSupported())
{ {
size += IntUtils.AlignUp(NodeStates.GetWorkBufferSize(totalMixCount) + EdgeMatrix.GetWorkBufferSize(totalMixCount), 16); size += BitUtils.AlignUp(NodeStates.GetWorkBufferSize(totalMixCount) + EdgeMatrix.GetWorkBufferSize(totalMixCount), 16);
} }
size = parameters.SinkCount * 0x170 + size = parameters.SinkCount * 0x170 +
@ -82,7 +82,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
size += 0x1807E; size += 0x1807E;
} }
size = IntUtils.AlignUp(size, 0x1000); size = BitUtils.AlignUp(size, 0x1000);
context.ResponseData.Write(size); context.ResponseData.Write(size);