From db2fec25c784288138b2d1e06d21ebe1e3b6517e Mon Sep 17 00:00:00 2001 From: riperiperi Date: Sun, 24 May 2020 17:06:45 +0100 Subject: [PATCH] Spacing cleanup, unrelated change. --- Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs | 1 - Ryujinx.Graphics.Gpu/Image/Texture.cs | 5 +---- Ryujinx.Graphics.Texture/LayoutConverter.cs | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs b/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs index 3049ea132..c0b878c48 100644 --- a/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs +++ b/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs @@ -7,7 +7,6 @@ namespace Ryujinx.Graphics.Gpu.Engine { partial class Methods { - /// /// Performs a buffer to buffer, or buffer to texture copy. /// diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index b484a266b..0f952ffd4 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -84,8 +84,6 @@ namespace Ryujinx.Graphics.Gpu.Image private int _sequenceNumber; - private bool _noSync; - /// /// Constructs a new instance of the cached GPU texture. /// @@ -303,7 +301,7 @@ namespace Ryujinx.Graphics.Gpu.Image { // Texture buffers are not handled here, instead they are invalidated (if modified) // when the texture is bound. This is handled by the buffer manager. - if ((_sequenceNumber == _context.SequenceNumber && _hasData) || _noSync) + if ((_sequenceNumber == _context.SequenceNumber && _hasData) || Info.Target == Target.TextureBuffer) { return; } @@ -1001,7 +999,6 @@ namespace Ryujinx.Graphics.Gpu.Image _depth = info.GetDepth(); _layers = info.GetLayers(); - _noSync = Info.Target == Target.TextureBuffer; } /// diff --git a/Ryujinx.Graphics.Texture/LayoutConverter.cs b/Ryujinx.Graphics.Texture/LayoutConverter.cs index 95768aede..9efcc16b2 100644 --- a/Ryujinx.Graphics.Texture/LayoutConverter.cs +++ b/Ryujinx.Graphics.Texture/LayoutConverter.cs @@ -41,14 +41,14 @@ namespace Ryujinx.Graphics.Texture int mipGobBlocksInY = gobBlocksInY; int mipGobBlocksInZ = gobBlocksInZ; - int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; + int gobWidth = (GobStride / bytesPerPixel) * gobBlocksInTileX; int gobHeight = gobBlocksInY * GobHeight; for (int level = 0; level < levels; level++) { - int w = Math.Max(1, width >> level); + int w = Math.Max(1, width >> level); int h = Math.Max(1, height >> level); - int d = Math.Max(1, depth >> level); + int d = Math.Max(1, depth >> level); w = BitUtils.DivRoundUp(w, blockWidth); h = BitUtils.DivRoundUp(h, blockHeight); @@ -344,7 +344,7 @@ namespace Ryujinx.Graphics.Texture int bytesPerPixel, ReadOnlySpan data) { - int w = BitUtils.DivRoundUp(width, blockWidth); + int w = BitUtils.DivRoundUp(width, blockWidth); int h = BitUtils.DivRoundUp(height, blockHeight); int inStride = BitUtils.AlignUp(w * bytesPerPixel, HostStrideAlignment);