From 85d0327542e6ecb25a44ac534587383bb18764e3 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Tue, 26 May 2020 23:43:03 +0100 Subject: [PATCH] Fix some nits. (part 1 of review feedback) --- Ryujinx.Graphics.Texture/BlockLinearLayout.cs | 6 +++++- Ryujinx.Graphics.Texture/LayoutConverter.cs | 2 -- Ryujinx.Graphics.Texture/OffsetCalculator.cs | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Ryujinx.Graphics.Texture/BlockLinearLayout.cs b/Ryujinx.Graphics.Texture/BlockLinearLayout.cs index 2227e5ffc..0b1122421 100644 --- a/Ryujinx.Graphics.Texture/BlockLinearLayout.cs +++ b/Ryujinx.Graphics.Texture/BlockLinearLayout.cs @@ -118,7 +118,11 @@ namespace Ryujinx.Graphics.Texture 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. diff --git a/Ryujinx.Graphics.Texture/LayoutConverter.cs b/Ryujinx.Graphics.Texture/LayoutConverter.cs index 62d9119ed..525271c4c 100644 --- a/Ryujinx.Graphics.Texture/LayoutConverter.cs +++ b/Ryujinx.Graphics.Texture/LayoutConverter.cs @@ -64,7 +64,6 @@ namespace Ryujinx.Graphics.Texture } int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16); - int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64); int xStart = strideTrunc / bytesPerPixel; @@ -237,7 +236,6 @@ namespace Ryujinx.Graphics.Texture } int strideTrunc = BitUtils.AlignDown(w * bytesPerPixel, 16); - int strideTrunc64 = BitUtils.AlignDown(w * bytesPerPixel, 64); int xStart = strideTrunc / bytesPerPixel; diff --git a/Ryujinx.Graphics.Texture/OffsetCalculator.cs b/Ryujinx.Graphics.Texture/OffsetCalculator.cs index 4817e50ad..b5b9f68d7 100644 --- a/Ryujinx.Graphics.Texture/OffsetCalculator.cs +++ b/Ryujinx.Graphics.Texture/OffsetCalculator.cs @@ -100,7 +100,11 @@ namespace Ryujinx.Graphics.Texture { 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 {