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

Fix some nits. (part 1 of review feedback)

Browse source
This commit is contained in:
riperiperi 2020-05-26 23:43:03 +01:00
parent 764e8fdde2
commit 85d0327542
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ryujinx.Graphics.Texture/BlockLinearLayout.cs
View file

@ -118,7 +118,11 @@ namespace Ryujinx.Graphics.Texture
public bool LayoutMatches(BlockLinearLayout other) public bool LayoutMatches(BlockLinearLayout other)
{ {
return _robSize == other._robSize && _sliceSize == other._sliceSize && _texBpp == other._texBpp && _bhMask == other._bhMask && _bdMask == other._bdMask; return _robSize == other._robSize &&
_sliceSize == other._sliceSize &&
_texBpp == other._texBpp &&
_bhMask == other._bhMask &&
_bdMask == other._bdMask;
} }
// Functions for built in iteration. // Functions for built in iteration.

2
Ryujinx.Graphics.Texture/LayoutConverter.cs
View file

@ -64,7 +64,6 @@ namespace Ryujinx.Graphics.Texture
} }
int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16); int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16);
int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64); int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64);
int xStart = strideTrunc / bytesPerPixel; int xStart = strideTrunc / bytesPerPixel;
@ -237,7 +236,6 @@ namespace Ryujinx.Graphics.Texture
} }
int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16); int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16);
int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64); int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64);
int xStart = strideTrunc / bytesPerPixel; int xStart = strideTrunc / bytesPerPixel;

6
Ryujinx.Graphics.Texture/OffsetCalculator.cs
View file

@ -100,7 +100,11 @@ namespace Ryujinx.Graphics.Texture
{ {
if (_isLinear) if (_isLinear)
{ {
return other._isLinear && _width == other._width && _height == other._height && _stride == other._stride && _bytesPerPixel == other._bytesPerPixel; return other._isLinear &&
_width == other._width &&
_height == other._height &&
_stride == other._stride &&
_bytesPerPixel == other._bytesPerPixel;
} }
else else
{ {