refactor(graphics): split renderer and recompiler into focused modules

src/graphics/shader/recompiler/ShaderRecompiler.cpp

@@ -2,17 +2,17 @@
 
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "graphics/shader/recompiler/BindingLayout.h"
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
-#include "graphics/shader/recompiler/ResourceTracking.h"
-#include "graphics/shader/recompiler/ScalarProvenance.h"
-#include "graphics/shader/recompiler/ShaderCFG.h"
-#include "graphics/shader/recompiler/ShaderDecoder.h"
-#include "graphics/shader/recompiler/ShaderIR.h"
-#include "graphics/shader/recompiler/ShaderInfoCollection.h"
-#include "graphics/shader/recompiler/SpirvEmitter.h"
-#include "graphics/shader/recompiler/SrtPatcher.h"
-#include "graphics/shader/recompiler/SrtWalker.h"
+#include "graphics/shader/recompiler/ir/BindingLayout.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ResourceTracking.h"
+#include "graphics/shader/recompiler/ir/ScalarProvenance.h"
+#include "graphics/shader/recompiler/cfg/ShaderCFG.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderInfoCollection.h"
+#include "graphics/shader/recompiler/emitter/SpirvEmitter.h"
+#include "graphics/shader/recompiler/ir/SrtPatcher.h"
+#include "graphics/shader/recompiler/ir/SrtWalker.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/ShaderRecompiler.h

@@ -3,7 +3,7 @@
 
 #include "common/common.h"
 #include "common/stringUtils.h"
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
 #include "graphics/shader/shader.h"
 
 #include <optional>

src/graphics/shader/recompiler/cfg/ShaderCFG.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ShaderCFG.h"
+#include "graphics/shader/recompiler/cfg/ShaderCFG.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/cfg/ShaderCFG.h

@@ -3,7 +3,7 @@
 
 #include "common/common.h"
 #include "common/stringUtils.h"
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 #include <vector>
 

src/graphics/shader/recompiler/decompiler/ExportOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ExportOps.h"
+#include "graphics/shader/recompiler/decompiler/ExportOps.h"
 
 #include <fmt/format.h>
 

src/graphics/shader/recompiler/decompiler/ExportOps.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_EXPORTOPS_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_EXPORTOPS_H_
 
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Decoder {
 

src/graphics/shader/recompiler/decompiler/ImageOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ImageOps.h"
+#include "graphics/shader/recompiler/decompiler/ImageOps.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/decompiler/ImageOps.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_IMAGEOPS_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_IMAGEOPS_H_
 
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Decoder {
 

src/graphics/shader/recompiler/decompiler/MemoryOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/MemoryOps.h"
+#include "graphics/shader/recompiler/decompiler/MemoryOps.h"
 
 #include <fmt/format.h>
 #include <iterator>

src/graphics/shader/recompiler/decompiler/MemoryOps.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_MEMORYOPS_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_MEMORYOPS_H_
 
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Decoder {
 

src/graphics/shader/recompiler/decompiler/ScalarAluOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ScalarAluOps.h"
+#include "graphics/shader/recompiler/decompiler/ScalarAluOps.h"
 
 #include <iterator>
 

src/graphics/shader/recompiler/decompiler/ScalarAluOps.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SCALARALUOPS_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SCALARALUOPS_H_
 
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Decoder {
 

src/graphics/shader/recompiler/decompiler/ShaderDecoder.cpp

@@ -1,10 +1,10 @@
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
-#include "graphics/shader/recompiler/ExportOps.h"
-#include "graphics/shader/recompiler/ImageOps.h"
-#include "graphics/shader/recompiler/MemoryOps.h"
-#include "graphics/shader/recompiler/ScalarAluOps.h"
-#include "graphics/shader/recompiler/VectorAluOps.h"
+#include "graphics/shader/recompiler/decompiler/ExportOps.h"
+#include "graphics/shader/recompiler/decompiler/ImageOps.h"
+#include "graphics/shader/recompiler/decompiler/MemoryOps.h"
+#include "graphics/shader/recompiler/decompiler/ScalarAluOps.h"
+#include "graphics/shader/recompiler/decompiler/VectorAluOps.h"
 
 #include <algorithm>
 #include <bit>

src/graphics/shader/recompiler/decompiler/VectorAluOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/VectorAluOps.h"
+#include "graphics/shader/recompiler/decompiler/VectorAluOps.h"
 
 #include <fmt/format.h>
 #include <iterator>

src/graphics/shader/recompiler/decompiler/VectorAluOps.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_VECTORALUOPS_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_VECTORALUOPS_H_
 
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Decoder {
 

src/graphics/shader/recompiler/emitter/SpirvBuilder.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/SpirvBuilder.h"
+#include "graphics/shader/recompiler/emitter/SpirvBuilder.h"
 
 #include <cstdio>
 #include <cstring>

src/graphics/shader/recompiler/emitter/SpirvEmitter.cpp

@@ -1,7 +1,7 @@
-#include "graphics/shader/recompiler/SpirvEmitter.h"
+#include "graphics/shader/recompiler/emitter/SpirvEmitter.h"
 
-#include "graphics/shader/recompiler/SrtWalker.h"
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/ir/SrtWalker.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/emitter/SpirvEmitter.h

@@ -3,7 +3,7 @@
 
 #include "common/common.h"
 #include "common/stringUtils.h"
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
 
 #include <vector>
 

src/graphics/shader/recompiler/emitter/spirvEmitterAluOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterAnalysis.cpp

@@ -1,7 +1,7 @@
 #include "common/assert.h"
 #include "graphics/guest_gpu/gpu_defs.h"
-#include "graphics/shader/recompiler/SpirvEmitter.h"
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/SpirvEmitter.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterControlFlow.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterExport.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterFlowOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterImageHelpers.cpp

@@ -1,5 +1,5 @@
 #include "common/assert.h"
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterImageOps.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterInternal.h

@@ -3,11 +3,11 @@
 
 #include "common/common.h"
 #include "common/stringUtils.h"
-#include "graphics/shader/recompiler/BindingLayout.h"
+#include "graphics/shader/recompiler/ir/BindingLayout.h"
 #include "graphics/shader/recompiler/BufferFormat.h"
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
-#include "graphics/shader/recompiler/ShaderIR.h"
-#include "graphics/shader/recompiler/SpirvBuilder.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
+#include "graphics/shader/recompiler/emitter/SpirvBuilder.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/emitter/spirvEmitterMemory.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterModule.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/emitter/spirvEmitterValues.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h"
+#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h"
 
 namespace Libs::Graphics::ShaderRecompiler::Spirv::Emitter {
 

src/graphics/shader/recompiler/ir/BindingLayout.cpp

@@ -1,6 +1,6 @@
-#include "graphics/shader/recompiler/BindingLayout.h"
+#include "graphics/shader/recompiler/ir/BindingLayout.h"
 
-#include "graphics/shader/recompiler/ScalarProvenance.h"
+#include "graphics/shader/recompiler/ir/ScalarProvenance.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/ir/BindingLayout.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_BINDINGLAYOUT_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_BINDINGLAYOUT_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/ResourceMaterialization.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
 
 #include "graphics/guest_gpu/gpu_format.h"
 #include "graphics/shader/shaderBindings.h"

src/graphics/shader/recompiler/ir/ResourceMaterialization.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_RESOURCEMATERIALIZATION_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_RESOURCEMATERIALIZATION_H_
 
-#include "graphics/shader/recompiler/SrtWalker.h"
+#include "graphics/shader/recompiler/ir/SrtWalker.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/ResourceTracking.cpp

@@ -1,6 +1,6 @@
-#include "graphics/shader/recompiler/ResourceTracking.h"
+#include "graphics/shader/recompiler/ir/ResourceTracking.h"
 
-#include "graphics/shader/recompiler/ScalarProvenance.h"
+#include "graphics/shader/recompiler/ir/ScalarProvenance.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ResourceTracking.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_RESOURCETRACKING_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_RESOURCETRACKING_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/ScalarProvenance.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ScalarProvenance.h"
+#include "graphics/shader/recompiler/ir/ScalarProvenance.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/ir/ScalarProvenance.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SCALARPROVENANCE_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SCALARPROVENANCE_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/ShaderIR.cpp

@@ -1,8 +1,8 @@
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 #include "common/assert.h"
 #include "graphics/shader/recompiler/BufferFormat.h"
-#include "graphics/shader/recompiler/shaderIR/ShaderIRInternal.h"
+#include "graphics/shader/recompiler/ir/ShaderIRInternal.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ShaderIR.h

@@ -3,8 +3,8 @@
 
 #include "common/common.h"
 #include "common/stringUtils.h"
-#include "graphics/shader/recompiler/ShaderCFG.h"
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/cfg/ShaderCFG.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 #include "graphics/shader/shader.h"
 
 #include <array>

src/graphics/shader/recompiler/ir/ShaderIRInternal.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_SRC_GRAPHICS_SHADER_RECOMPILER_SHADERIR_SHADERIRINTERNAL_H_
 #define EMULATOR_SRC_GRAPHICS_SHADER_RECOMPILER_SHADERIR_SHADERIRINTERNAL_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/ShaderIRLog.cpp

@@ -1,7 +1,7 @@
 #include "common/assert.h"
 #include "graphics/shader/recompiler/BufferFormat.h"
-#include "graphics/shader/recompiler/ShaderIR.h"
-#include "graphics/shader/recompiler/shaderIR/ShaderIRInternal.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIRInternal.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ShaderIRMemory.cpp

@@ -1,7 +1,7 @@
 #include "common/assert.h"
 #include "graphics/shader/recompiler/BufferFormat.h"
-#include "graphics/shader/recompiler/ShaderIR.h"
-#include "graphics/shader/recompiler/shaderIR/ShaderIRInternal.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIRInternal.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ShaderIROpcodes.cpp

@@ -1,7 +1,7 @@
 #include "common/assert.h"
 #include "graphics/shader/recompiler/BufferFormat.h"
-#include "graphics/shader/recompiler/ShaderIR.h"
-#include "graphics/shader/recompiler/shaderIR/ShaderIRInternal.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIRInternal.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ShaderInfoCollection.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ShaderInfoCollection.h"
+#include "graphics/shader/recompiler/ir/ShaderInfoCollection.h"
 
 #include <algorithm>
 #include <fmt/format.h>

src/graphics/shader/recompiler/ir/ShaderInfoCollection.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SHADERINFOCOLLECTION_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SHADERINFOCOLLECTION_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/SrtPatcher.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/SrtPatcher.h"
+#include "graphics/shader/recompiler/ir/SrtPatcher.h"
 
 #include <fmt/format.h>
 #include <functional>

src/graphics/shader/recompiler/ir/SrtPatcher.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SRTPATCHER_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SRTPATCHER_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 namespace Libs::Graphics::ShaderRecompiler::IR {
 

src/graphics/shader/recompiler/ir/SrtWalker.cpp

@@ -1,6 +1,6 @@
-#include "graphics/shader/recompiler/SrtWalker.h"
+#include "graphics/shader/recompiler/ir/SrtWalker.h"
 
-#include "graphics/shader/recompiler/ScalarProvenance.h"
+#include "graphics/shader/recompiler/ir/ScalarProvenance.h"
 
 #include <algorithm>
 #include <array>

src/graphics/shader/recompiler/ir/SrtWalker.h

@@ -1,7 +1,7 @@
 #ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SRTWALKER_H_
 #define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_SHADER_RECOMPILER_SRTWALKER_H_
 
-#include "graphics/shader/recompiler/ShaderIR.h"
+#include "graphics/shader/recompiler/ir/ShaderIR.h"
 
 #include <optional>
 #include <span>

src/graphics/shader/shader.cpp

@@ -13,7 +13,7 @@
 #include "graphics/guest_gpu/graphicsRun.h"
 #include "graphics/guest_gpu/hardwareContext.h"
 #include "graphics/host_gpu/renderer/renderContext.h"
-#include "graphics/shader/recompiler/ShaderDecoder.h"
+#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h"
 #include "graphics/shader/recompiler/ShaderRecompiler.h"
 #include "graphics/shader/shaderVertexMetadata.h"
 #include "libs/errno.h"

src/graphics/shader/shaderStageRuntime.cpp

@@ -1,4 +1,4 @@
-#include "graphics/shader/recompiler/ResourceMaterialization.h"
+#include "graphics/shader/recompiler/ir/ResourceMaterialization.h"
 #include "graphics/shader/shader.h"
 
 #include <utility>