Fix shaders with global memory access from unknown locations (#4029)

* Fix shaders with global memory access from unknown locations

* Shader cache version bump

Ryujinx.Ava/Assets/Locales/de_DE.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Aktiviere Fs Zugriff-Logs",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Globaler Zugriff-Log-Modus:",
   "SettingsTabLoggingDeveloperOptions": "Entwickleroptionen (WARNUNG: Beeinträchtigt die Leistung)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL Logstufe:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Keine",
-  "SettingsTabLoggingOpenglLogLevelError": "Fehler",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Verlangsamungen",
-  "SettingsTabLoggingOpenglLogLevelAll": "Alle",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Keine",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Fehler",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Verlangsamungen",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Alle",
   "SettingsTabLoggingEnableDebugLogs": "Aktiviere Debug-Log",
   "SettingsTabInput": "Eingabe",
   "SettingsTabInputEnableDockedMode": "Docked Modus",

Ryujinx.Ava/Assets/Locales/el_GR.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Ενεργοποίηση Καταγραφής Πρόσβασης FS",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Λειτουργία Καταγραφής Καθολικής Πρόσβασης FS:",
   "SettingsTabLoggingDeveloperOptions": "Επιλογές Προγραμματιστή (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η απόδοση Θα μειωθεί)",
-  "SettingsTabLoggingOpenglLogLevel": "Επίπεδο Καταγραφής OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Κανένα",
-  "SettingsTabLoggingOpenglLogLevelError": "Σφάλμα",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Επιβραδύνσεις",
-  "SettingsTabLoggingOpenglLogLevelAll": "Όλα",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Κανένα",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Σφάλμα",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Επιβραδύνσεις",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Όλα",
   "SettingsTabLoggingEnableDebugLogs": "Ενεργοποίηση Αρχείων Καταγραφής Εντοπισμού Σφαλμάτων",
   "SettingsTabInput": "Χειρισμός",
   "SettingsTabInputEnableDockedMode": "Ενεργοποίηση Docked Mode",

Ryujinx.Ava/Assets/Locales/en_US.json

@@ -157,11 +157,11 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Enable Fs Access Logs",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Global Access Log Mode:",
   "SettingsTabLoggingDeveloperOptions": "Developer Options (WARNING: Will reduce performance)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL Log Level:",
-  "SettingsTabLoggingOpenglLogLevelNone": "None",
-  "SettingsTabLoggingOpenglLogLevelError": "Error",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Slowdowns",
-  "SettingsTabLoggingOpenglLogLevelAll": "All",
+  "SettingsTabLoggingGraphicsBackendLogLevel": "Graphics Backend Log Level:",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "None",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Error",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Slowdowns",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "All",
   "SettingsTabLoggingEnableDebugLogs": "Enable Debug Logs",
   "SettingsTabInput": "Input",
   "SettingsTabInputEnableDockedMode": "Docked Mode",

Ryujinx.Ava/Assets/Locales/es_ES.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Habilitar registros de Fs Access",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Modo de registros Fs Global Access:",
   "SettingsTabLoggingDeveloperOptions": "Opciones de desarrollador (ADVERTENCIA: empeorarán el rendimiento)",
-  "SettingsTabLoggingOpenglLogLevel": "Nivel de registro de OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Nada",
-  "SettingsTabLoggingOpenglLogLevelError": "Errores",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Ralentizaciones",
-  "SettingsTabLoggingOpenglLogLevelAll": "Todo",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Nada",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Errores",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Ralentizaciones",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Todo",
   "SettingsTabLoggingEnableDebugLogs": "Habilitar registros de debug",
   "SettingsTabInput": "Entrada",
   "SettingsTabInputEnableDockedMode": "Modo dock/TV",

Ryujinx.Ava/Assets/Locales/fr_FR.json

@@ -150,11 +150,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Activer les journaux des accès au système de fichiers",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Niveau des journaux des accès au système de fichiers:",
   "SettingsTabLoggingDeveloperOptions": "Options développeur (ATTENTION: Cela peut réduire les performances)",
-  "SettingsTabLoggingOpenglLogLevel": "Niveau des journaux OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Aucun",
-  "SettingsTabLoggingOpenglLogLevelError": "Erreur",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Ralentissements",
-  "SettingsTabLoggingOpenglLogLevelAll": "Tout",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Aucun",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Erreur",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Ralentissements",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Tout",
   "SettingsTabLoggingEnableDebugLogs": "Activer les journaux de debug",
   "SettingsTabInput": "Contrôles",
   "SettingsTabInputEnableDockedMode": "Active le mode station d'accueil",

Ryujinx.Ava/Assets/Locales/it_IT.json

@@ -157,11 +157,10 @@
     "SettingsTabLoggingEnableFsAccessLogs": "Attiva Fs Access Logs",
     "SettingsTabLoggingFsGlobalAccessLogMode": "Modalità log accesso globale Fs:",
     "SettingsTabLoggingDeveloperOptions": "Opzioni da sviluppatore (AVVISO: Ridurrà le prestazioni)",
-    "SettingsTabLoggingOpenglLogLevel": "Livello di log OpenGL:",
-    "SettingsTabLoggingOpenglLogLevelNone": "Nessuno",
-    "SettingsTabLoggingOpenglLogLevelError": "Errore",
-    "SettingsTabLoggingOpenglLogLevelPerformance": "Rallentamenti",
-    "SettingsTabLoggingOpenglLogLevelAll": "Tutto",
+    "SettingsTabLoggingGraphicsBackendLogLevelNone": "Nessuno",
+    "SettingsTabLoggingGraphicsBackendLogLevelError": "Errore",
+    "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Rallentamenti",
+    "SettingsTabLoggingGraphicsBackendLogLevelAll": "Tutto",
     "SettingsTabLoggingEnableDebugLogs": "Attiva logs di debug",
     "SettingsTabInput": "Input",
     "SettingsTabInputEnableDockedMode": "Attiva modalità TV",
@@ -558,8 +557,8 @@
     "SettingsSelectThemeFileDialogTitle" : "Seleziona file del tema",
     "SettingsXamlThemeFile" : "File del tema xaml",
     "SettingsTabHotkeysResScaleUpHotkey": "Aumentare la risoluzione:",
-    "SettingsTabHotkeysResScaleDownHotkey": "Diminuire la risoluzione:"
-    "AvatarWindowTitle": "Gestisci account - Avatar"
+    "SettingsTabHotkeysResScaleDownHotkey": "Diminuire la risoluzione:",
+    "AvatarWindowTitle": "Gestisci account - Avatar",
     "Amiibo": "Amiibo",
     "Unknown": "Sconosciuto",
     "Usage": "Utilizzo",

Ryujinx.Ava/Assets/Locales/ja_JP.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Fs アクセスログを有効",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Fs グローバルアクセスログモード:",
   "SettingsTabLoggingDeveloperOptions": "開発者オプション (警告: パフォーマンスが低下します)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL ログレベル:",
-  "SettingsTabLoggingOpenglLogLevelNone": "なし",
-  "SettingsTabLoggingOpenglLogLevelError": "エラー",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "パフォーマンス低下",
-  "SettingsTabLoggingOpenglLogLevelAll": "すべて",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "なし",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "エラー",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "パフォーマンス低下",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "すべて",
   "SettingsTabLoggingEnableDebugLogs": "デバッグログを有効",
   "SettingsTabInput": "入力",
   "SettingsTabInputEnableDockedMode": "ドッキングモード",

Ryujinx.Ava/Assets/Locales/ko_KR.json

@@ -156,11 +156,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Fs 액세스 로그 켜기",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Fs 전역 액세스 로그 모드 :",
   "SettingsTabLoggingDeveloperOptions": "개발자 옵션 (경고 : 성능이 저하됩니다.)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL 로그 수준 :",
-  "SettingsTabLoggingOpenglLogLevelNone": "없음",
-  "SettingsTabLoggingOpenglLogLevelError": "오류",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "감속",
-  "SettingsTabLoggingOpenglLogLevelAll": "모두",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "없음",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "오류",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "감속",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "모두",
   "SettingsTabLoggingEnableDebugLogs": "디버그 로그 사용",
   "SettingsTabInput": "입력",
   "SettingsTabInputEnableDockedMode": "도킹 모드 활성화",

Ryujinx.Ava/Assets/Locales/pl_PL.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Włącz Logi Dostępu do Systemu Plików",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Tryb Globalnych Logów Systemu Plików:",
   "SettingsTabLoggingDeveloperOptions": "Opcje programistyczne (OSTRZEŻENIE: Zmniejszą wydajność)",
-  "SettingsTabLoggingOpenglLogLevel": "Poziom Logów OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Żadne",
-  "SettingsTabLoggingOpenglLogLevelError": "Błędy",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Spowolnienia",
-  "SettingsTabLoggingOpenglLogLevelAll": "Wszystkie",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Żadne",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Błędy",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Spowolnienia",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Wszystkie",
   "SettingsTabLoggingEnableDebugLogs": "Włącz Logi Debugowania",
   "SettingsTabInput": "Sterowanie",
   "SettingsTabInputEnableDockedMode": "Tryb Zadokowany",

Ryujinx.Ava/Assets/Locales/pt_BR.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Habilitar logs de acesso ao sistema de arquivos",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Modo global de logs do sistema de arquivos:",
   "SettingsTabLoggingDeveloperOptions": "Opções do desenvolvedor (AVISO: Vai reduzir a performance)",
-  "SettingsTabLoggingOpenglLogLevel": "Nível de log do OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Nenhum",
-  "SettingsTabLoggingOpenglLogLevelError": "Erro",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Lentidão",
-  "SettingsTabLoggingOpenglLogLevelAll": "Todos",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Nenhum",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Erro",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Lentidão",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Todos",
   "SettingsTabLoggingEnableDebugLogs": "Habilitar logs de depuração",
   "SettingsTabInput": "Controle",
   "SettingsTabInputEnableDockedMode": "Habilitar modo TV",

Ryujinx.Ava/Assets/Locales/ru_RU.json

@@ -156,11 +156,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Включить журналы доступа Fs",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Режим журнала глобального доступа Fs:",
   "SettingsTabLoggingDeveloperOptions": "Параметры разработчика (ВНИМАНИЕ: снизит производительность)",
-  "SettingsTabLoggingOpenglLogLevel": "Уровень журнала OpenGL:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Ничего",
-  "SettingsTabLoggingOpenglLogLevelError": "Ошибка",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Замедления",
-  "SettingsTabLoggingOpenglLogLevelAll": "Всё",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Ничего",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Ошибка",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Замедления",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Всё",
   "SettingsTabLoggingEnableDebugLogs": "Включить журналы отладки",
   "SettingsTabInput": "Управление",
   "SettingsTabInputEnableDockedMode": "Включить режим закрепления",

Ryujinx.Ava/Assets/Locales/tr_TR.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "Fs Erişim Loglarını Etkinleştir",
   "SettingsTabLoggingFsGlobalAccessLogMode": "Fs Evrensel Erişim Log Modu:",
   "SettingsTabLoggingDeveloperOptions": "Geliştirici Seçenekleri (UYARI: Performansı düşürecektir)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL Log Seviyesi:",
-  "SettingsTabLoggingOpenglLogLevelNone": "Hiç",
-  "SettingsTabLoggingOpenglLogLevelError": "Hata",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "Yavaşlamalar",
-  "SettingsTabLoggingOpenglLogLevelAll": "Her Şey",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "Hiç",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "Hata",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "Yavaşlamalar",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "Her Şey",
   "SettingsTabLoggingEnableDebugLogs": "Hata Ayıklama Loglarını Etkinleştir",
   "SettingsTabInput": "Giriş Yöntemi",
   "SettingsTabInputEnableDockedMode": "Docked Modunu Etkinleştir",

Ryujinx.Ava/Assets/Locales/zh_CN.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "记录文件访问",
   "SettingsTabLoggingFsGlobalAccessLogMode": "记录全局文件访问模式:",
   "SettingsTabLoggingDeveloperOptions": "开发者选项 (警告: 会降低性能)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL日志级别:",
-  "SettingsTabLoggingOpenglLogLevelNone": "无",
-  "SettingsTabLoggingOpenglLogLevelError": "错误",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "减速",
-  "SettingsTabLoggingOpenglLogLevelAll": "全部",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "无",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "错误",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "减速",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "全部",
   "SettingsTabLoggingEnableDebugLogs": "启用调试日志",
   "SettingsTabInput": "输入",
   "SettingsTabInputEnableDockedMode": "主机模式",

Ryujinx.Ava/Assets/Locales/zh_TW.json

@@ -157,11 +157,10 @@
   "SettingsTabLoggingEnableFsAccessLogs": "記錄檔案存取",
   "SettingsTabLoggingFsGlobalAccessLogMode": "記錄全域檔案存取模式:",
   "SettingsTabLoggingDeveloperOptions": "開發者選項 (警告: 會降低效能)",
-  "SettingsTabLoggingOpenglLogLevel": "OpenGL 日誌級別:",
-  "SettingsTabLoggingOpenglLogLevelNone": "無",
-  "SettingsTabLoggingOpenglLogLevelError": "錯誤",
-  "SettingsTabLoggingOpenglLogLevelPerformance": "減速",
-  "SettingsTabLoggingOpenglLogLevelAll": "全部",
+  "SettingsTabLoggingGraphicsBackendLogLevelNone": "無",
+  "SettingsTabLoggingGraphicsBackendLogLevelError": "錯誤",
+  "SettingsTabLoggingGraphicsBackendLogLevelPerformance": "減速",
+  "SettingsTabLoggingGraphicsBackendLogLevelAll": "全部",
   "SettingsTabLoggingEnableDebugLogs": "啟用除錯日誌",
   "SettingsTabInput": "輸入",
   "SettingsTabInputEnableDockedMode": "Docked 模式",

Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml

@@ -876,7 +876,7 @@
                                 </StackPanel>
                                 <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
                                     <TextBlock VerticalAlignment="Center"
-                                            Text="{locale:Locale SettingsTabLoggingOpenglLogLevel}"
+                                            Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevel}"
                                             ToolTip.Tip="{locale:Locale OpenGlLogLevel}"
                                             Width="285" />
                                     <ComboBox SelectedIndex="{Binding OpenglDebugLevel}"
@@ -884,17 +884,17 @@
                                             HorizontalContentAlignment="Left"
                                             ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
                                         <ComboBoxItem>
-                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelNone}" />
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
                                         </ComboBoxItem>
                                         <ComboBoxItem>
-                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelError}" />
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
                                         </ComboBoxItem>
                                         <ComboBoxItem>
                                             <TextBlock
-                                                Text="{locale:Locale SettingsTabLoggingOpenglLogLevelPerformance}" />
+                                                Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
                                         </ComboBoxItem>
                                         <ComboBoxItem>
-                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelAll}" />
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
                                         </ComboBoxItem>
                                     </ComboBox>
                                 </StackPanel>

Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 4011;
+        private const uint CodeGenVersion = 4029;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

Ryujinx.Graphics.Shader/Translation/Rewriter.cs

@@ -21,10 +21,11 @@ namespace Ryujinx.Graphics.Shader.Translation
             {
                 BasicBlock block = blocks[blkIndex];
 
-                for (LinkedListNode<INode> node = block.Operations.First; node != null; node = node.Next)
+                for (LinkedListNode<INode> node = block.Operations.First; node != null;)
                 {
                     if (node.Value is not Operation operation)
                     {
+                        node = node.Next;
                         continue;
                     }
 
@@ -43,10 +44,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                         }
                     }
 
-                    if (UsesGlobalMemory(operation.Inst))
-                    {
-                        node = RewriteGlobalAccess(node, config);
-                    }
+                    LinkedListNode<INode> nextNode = node.Next;
 
                     if (operation is TextureOperation texOp)
                     {
@@ -59,7 +57,15 @@ namespace Ryujinx.Graphics.Shader.Translation
                                 node = InsertSnormNormalization(node, config);
                             }
                         }
+
+                        nextNode = node.Next;
                     }
+                    else if (UsesGlobalMemory(operation.Inst))
+                    {
+                        nextNode = RewriteGlobalAccess(node, config)?.Next ?? nextNode;
+                    }
+
+                    node = nextNode;
                 }
             }
         }
@@ -72,7 +78,7 @@ namespace Ryujinx.Graphics.Shader.Translation
             bool isStg16Or8 = operation.Inst == Instruction.StoreGlobal16 || operation.Inst == Instruction.StoreGlobal8;
             bool isWrite = isAtomic || operation.Inst == Instruction.StoreGlobal || isStg16Or8;
 
-            Operation storageOp;
+            Operation storageOp = null;
 
             Operand PrependOperation(Instruction inst, params Operand[] sources)
             {
@@ -120,49 +126,56 @@ namespace Ryujinx.Graphics.Shader.Translation
                 sbSlot        = PrependOperation(Instruction.ConditionalSelect, inRange, Const(slot), sbSlot);
             }
 
-            Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
-
-            Operand baseAddrTrunc = PrependOperation(Instruction.BitwiseAnd, sbBaseAddrLow, alignMask);
-            Operand byteOffset    = PrependOperation(Instruction.Subtract, addrLow, baseAddrTrunc);
-
-            Operand[] sources = new Operand[operation.SourcesCount];
-
-            sources[0] = sbSlot;
-
-            if (isStg16Or8)
+            if (sbUseMask != 0)
             {
-                sources[1] = byteOffset;
-            }
-            else
-            {
-                sources[1] = PrependOperation(Instruction.ShiftRightU32, byteOffset, Const(2));
-            }
+                Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
 
-            for (int index = 2; index < operation.SourcesCount; index++)
-            {
-                sources[index] = operation.GetSource(index);
-            }
+                Operand baseAddrTrunc = PrependOperation(Instruction.BitwiseAnd, sbBaseAddrLow, alignMask);
+                Operand byteOffset    = PrependOperation(Instruction.Subtract, addrLow, baseAddrTrunc);
 
-            if (isAtomic)
-            {
-                Instruction inst = (operation.Inst & ~Instruction.MrMask) | Instruction.MrStorage;
+                Operand[] sources = new Operand[operation.SourcesCount];
 
-                storageOp = new Operation(inst, operation.Dest, sources);
-            }
-            else if (operation.Inst == Instruction.LoadGlobal)
-            {
-                storageOp = new Operation(Instruction.LoadStorage, operation.Dest, sources);
-            }
-            else
-            {
-                Instruction storeInst = operation.Inst switch
+                sources[0] = sbSlot;
+
+                if (isStg16Or8)
                 {
-                    Instruction.StoreGlobal16 => Instruction.StoreStorage16,
-                    Instruction.StoreGlobal8 => Instruction.StoreStorage8,
-                    _ => Instruction.StoreStorage
-                };
+                    sources[1] = byteOffset;
+                }
+                else
+                {
+                    sources[1] = PrependOperation(Instruction.ShiftRightU32, byteOffset, Const(2));
+                }
 
-                storageOp = new Operation(storeInst, null, sources);
+                for (int index = 2; index < operation.SourcesCount; index++)
+                {
+                    sources[index] = operation.GetSource(index);
+                }
+
+                if (isAtomic)
+                {
+                    Instruction inst = (operation.Inst & ~Instruction.MrMask) | Instruction.MrStorage;
+
+                    storageOp = new Operation(inst, operation.Dest, sources);
+                }
+                else if (operation.Inst == Instruction.LoadGlobal)
+                {
+                    storageOp = new Operation(Instruction.LoadStorage, operation.Dest, sources);
+                }
+                else
+                {
+                    Instruction storeInst = operation.Inst switch
+                    {
+                        Instruction.StoreGlobal16 => Instruction.StoreStorage16,
+                        Instruction.StoreGlobal8 => Instruction.StoreStorage8,
+                        _ => Instruction.StoreStorage
+                    };
+
+                    storageOp = new Operation(storeInst, null, sources);
+                }
+            }
+            else if (operation.Dest != null)
+            {
+                storageOp = new Operation(Instruction.Copy, operation.Dest, Const(0));
             }
 
             for (int index = 0; index < operation.SourcesCount; index++)
@@ -171,10 +184,18 @@ namespace Ryujinx.Graphics.Shader.Translation
             }
 
             LinkedListNode<INode> oldNode = node;
+            LinkedList<INode> oldNodeList = oldNode.List;
 
-            node = node.List.AddBefore(node, storageOp);
+            if (storageOp != null)
+            {
+                node = node.List.AddBefore(node, storageOp);
+            }
+            else
+            {
+                node = null;
+            }
 
-            node.List.Remove(oldNode);
+            oldNodeList.Remove(oldNode);
 
             return node;
         }