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

Merge branch 'master' into ICommonStateGetter

Browse source
This commit is contained in:
Lordmau5 2018-06-13 01:28:49 +02:00
commit e6f6c6ad57
10 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ryujinx.HLE/Gpu/TextureHelper.cs
View file

@ -33,6 +33,7 @@ namespace Ryujinx.HLE.Gpu
case GalTextureFormat.A1B5G5R5: return Texture.Width * Texture.Height * 2;
case GalTextureFormat.B5G6R5: return Texture.Width * Texture.Height * 2;
case GalTextureFormat.G8R8: return Texture.Width * Texture.Height * 2;
case GalTextureFormat.R16: return Texture.Width * Texture.Height * 2;
case GalTextureFormat.R8: return Texture.Width * Texture.Height;
case GalTextureFormat.BC1:

1
Ryujinx.HLE/Gpu/TextureReader.cs
View file

@ -17,6 +17,7 @@ namespace Ryujinx.HLE.Gpu
case GalTextureFormat.A1B5G5R5: return Read5551 (Memory, Texture);
case GalTextureFormat.B5G6R5: return Read565 (Memory, Texture);
case GalTextureFormat.G8R8: return Read2Bpp (Memory, Texture);
case GalTextureFormat.R16: return Read2Bpp (Memory, Texture);
case GalTextureFormat.R8: return Read1Bpp (Memory, Texture);
case GalTextureFormat.BC7U: return Read16Bpt4x4(Memory, Texture);
case GalTextureFormat.BC1: return Read8Bpt4x4 (Memory, Texture);

6
Ryujinx.HLE/Hid/Hid.cs
View file

@ -130,9 +130,7 @@ namespace Ryujinx.HLE.Input
{
long BaseControllerOffset = Position + HidControllersOffset + 8 * HidControllerSize;
HidControllerType Type =
HidControllerType.ControllerType_Handheld |
HidControllerType.ControllerType_JoyconPair;
HidControllerType Type = HidControllerType.ControllerType_Handheld;
bool IsHalf = false;
@ -276,4 +274,4 @@ namespace Ryujinx.HLE.Input
return (long)((ulong)Environment.TickCount * 19_200);
}
}
}
}