From a31fced221187850c8447d5d8142ca85f118b43e Mon Sep 17 00:00:00 2001 From: gdk Date: Sun, 3 Nov 2019 22:28:44 -0300 Subject: [PATCH] Remove some unused constants and other code --- .../Translation/Optimizations/BindlessToIndexed.cs | 10 ---------- .../Translation/Optimizations/GlobalToStorage.cs | 13 ------------- 2 files changed, 23 deletions(-) diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessToIndexed.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessToIndexed.cs index 8cb62db93..83f8fe9a7 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessToIndexed.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessToIndexed.cs @@ -7,16 +7,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { static class BindlessToIndexed { - private const int StorageDescsBaseOffset = 0x44; // In words. - - private const int UbeStorageDescsBaseOffset = 0x84; // In words. - private const int UbeStorageMaxCount = 14; - - private const int StorageDescSize = 4; // In words. - private const int StorageMaxCount = 16; - - private const int StorageDescsSize = StorageDescSize * StorageMaxCount; - public static void RunPass(BasicBlock block) { // We can turn a bindless texture access into a indexed access, diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs index 06db2a804..3d89faf6c 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs @@ -9,9 +9,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { private const int StorageDescsBaseOffset = 0x44; // In words. - private const int UbeStorageDescsBaseOffset = 0x84; // In words. - private const int UbeStorageMaxCount = 14; - private const int StorageDescSize = 4; // In words. private const int StorageMaxCount = 16; @@ -23,11 +20,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations int sbEnd = sbStart + StorageDescsSize; - // This one is only used on compute shaders. - // Compute shaders uses two separate sets of storage. - int ubeSbStart = UbeStorageDescsBaseOffset; - int ubeSbEnd = UbeStorageDescsBaseOffset + StorageDescSize * UbeStorageMaxCount; - for (LinkedListNode node = block.Operations.First; node != null; node = node.Next) { if (!(node.Value is Operation operation)) @@ -44,11 +36,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { int storageIndex = SearchForStorageBase(asgOperation, sbStart, sbEnd); - /*if (storageIndex < 0 && stage == ShaderStage.Compute) - { - storageIndex = SearchForStorageBase(asgOperation, ubeSbStart, ubeSbEnd); - }*/ - if (storageIndex >= 0) { node = ReplaceGlobalWithStorage(node, storageIndex);