diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99350ce21..604360900 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -158,16 +158,24 @@ file(GLOB kyty_emulator_src CONFIGURE_DEPENDS graphics/host_gpu/*.h graphics/host_gpu/renderer/*.cpp graphics/host_gpu/renderer/*.h + graphics/host_gpu/renderer/cache/*.cpp + graphics/host_gpu/renderer/cache/*.h + graphics/host_gpu/renderer/image/*.cpp + graphics/host_gpu/renderer/image/*.h + graphics/host_gpu/renderer/pipeline/*.cpp + graphics/host_gpu/renderer/pipeline/*.h graphics/shader/*.cpp graphics/shader/*.h graphics/shader/recompiler/*.cpp graphics/shader/recompiler/*.h - graphics/shader/recompiler/shaderIR/*.cpp - graphics/shader/recompiler/shaderIR/*.h - graphics/shader/recompiler/spirvEmitter/*.cpp - graphics/shader/recompiler/spirvEmitter/*.h - graphics/host_gpu/objects/*.cpp - graphics/host_gpu/objects/*.h + graphics/shader/recompiler/cfg/*.cpp + graphics/shader/recompiler/cfg/*.h + graphics/shader/recompiler/decompiler/*.cpp + graphics/shader/recompiler/decompiler/*.h + graphics/shader/recompiler/emitter/*.cpp + graphics/shader/recompiler/emitter/*.h + graphics/shader/recompiler/ir/*.cpp + graphics/shader/recompiler/ir/*.h graphics/presentation/*.cpp graphics/presentation/*.h graphics/presentation/window/*.cpp @@ -311,8 +319,8 @@ add_kyty_full_emulator_test(shader_cfg_tests ../tests/shaderCfgTests.cpp) add_executable(scalar_provenance_tests EXCLUDE_FROM_ALL ../tests/ScalarProvenanceTests.cpp graphics/host_gpu/hostMemory.cpp - graphics/shader/recompiler/ScalarProvenance.cpp - graphics/shader/recompiler/SrtWalker.cpp + graphics/shader/recompiler/ir/ScalarProvenance.cpp + graphics/shader/recompiler/ir/SrtWalker.cpp ) target_link_libraries(scalar_provenance_tests fmt::fmt) target_include_directories(scalar_provenance_tests PRIVATE ${inc_headers}) @@ -344,9 +352,9 @@ add_executable(shader_stage_runtime_tests EXCLUDE_FROM_ALL graphics/guest_gpu/gpu_format.cpp graphics/host_gpu/hostMemory.cpp graphics/shader/shaderStageRuntime.cpp - graphics/shader/recompiler/ResourceMaterialization.cpp - graphics/shader/recompiler/ScalarProvenance.cpp - graphics/shader/recompiler/SrtWalker.cpp + graphics/shader/recompiler/ir/ResourceMaterialization.cpp + graphics/shader/recompiler/ir/ScalarProvenance.cpp + graphics/shader/recompiler/ir/SrtWalker.cpp ) target_link_libraries(shader_stage_runtime_tests fmt::fmt) target_include_directories(shader_stage_runtime_tests PRIVATE ${inc_headers}) @@ -355,20 +363,20 @@ add_executable(resource_tracking_tests EXCLUDE_FROM_ALL ../tests/ResourceTrackingTests.cpp graphics/guest_gpu/gpu_format.cpp graphics/host_gpu/hostMemory.cpp - graphics/shader/recompiler/ScalarProvenance.cpp - graphics/shader/recompiler/SrtWalker.cpp - graphics/shader/recompiler/SrtPatcher.cpp - graphics/shader/recompiler/ResourceTracking.cpp - graphics/shader/recompiler/ResourceMaterialization.cpp - graphics/shader/recompiler/ShaderInfoCollection.cpp - graphics/shader/recompiler/BindingLayout.cpp + graphics/shader/recompiler/ir/ScalarProvenance.cpp + graphics/shader/recompiler/ir/SrtWalker.cpp + graphics/shader/recompiler/ir/SrtPatcher.cpp + graphics/shader/recompiler/ir/ResourceTracking.cpp + graphics/shader/recompiler/ir/ResourceMaterialization.cpp + graphics/shader/recompiler/ir/ShaderInfoCollection.cpp + graphics/shader/recompiler/ir/BindingLayout.cpp ) target_link_libraries(resource_tracking_tests fmt::fmt) target_include_directories(resource_tracking_tests PRIVATE ${inc_headers}) add_executable(resource_mutex_tests EXCLUDE_FROM_ALL ../tests/ResourceMutexTests.cpp - graphics/host_gpu/renderer/resourceMutex.cpp + graphics/host_gpu/renderer/cache/resourceMutex.cpp ) target_link_libraries(resource_mutex_tests common) target_include_directories(resource_mutex_tests PRIVATE ${inc_headers}) diff --git a/src/graphics/host_gpu/renderer/bufferCache.cpp b/src/graphics/host_gpu/renderer/cache/bufferCache.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/bufferCache.cpp rename to src/graphics/host_gpu/renderer/cache/bufferCache.cpp index 2d34b3d31..40c17e747 100644 --- a/src/graphics/host_gpu/renderer/bufferCache.cpp +++ b/src/graphics/host_gpu/renderer/cache/bufferCache.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/bufferCache.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" #include "common/assert.h" #include "common/logging/log.h" @@ -6,8 +6,8 @@ #include "graphics/host_gpu/graphicContext.h" #include "graphics/host_gpu/renderer/commandScheduler.h" #include "graphics/host_gpu/renderer/render.h" -#include "graphics/host_gpu/renderer/resourceMutex.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "kernel/memory.h" #include diff --git a/src/graphics/host_gpu/renderer/bufferCache.h b/src/graphics/host_gpu/renderer/cache/bufferCache.h similarity index 99% rename from src/graphics/host_gpu/renderer/bufferCache.h rename to src/graphics/host_gpu/renderer/cache/bufferCache.h index 9a9c11796..3bfad0580 100644 --- a/src/graphics/host_gpu/renderer/bufferCache.h +++ b/src/graphics/host_gpu/renderer/cache/bufferCache.h @@ -6,7 +6,7 @@ #include "common/threads.h" #include "graphics/host_gpu/memoryTracker.h" #include "graphics/host_gpu/rangeSet.h" -#include "graphics/host_gpu/renderer/streamBuffer.h" +#include "graphics/host_gpu/renderer/cache/streamBuffer.h" #include #include diff --git a/src/graphics/host_gpu/renderer/gpuResourceManager.cpp b/src/graphics/host_gpu/renderer/cache/gpuResourceManager.cpp similarity index 98% rename from src/graphics/host_gpu/renderer/gpuResourceManager.cpp rename to src/graphics/host_gpu/renderer/cache/gpuResourceManager.cpp index 25f7cc49f..728af7e94 100644 --- a/src/graphics/host_gpu/renderer/gpuResourceManager.cpp +++ b/src/graphics/host_gpu/renderer/cache/gpuResourceManager.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/gpuResourceManager.h" +#include "graphics/host_gpu/renderer/cache/gpuResourceManager.h" #include "common/assert.h" #include "graphics/guest_gpu/command_processor/commandProcessor.h" diff --git a/src/graphics/host_gpu/renderer/gpuResourceManager.h b/src/graphics/host_gpu/renderer/cache/gpuResourceManager.h similarity index 90% rename from src/graphics/host_gpu/renderer/gpuResourceManager.h rename to src/graphics/host_gpu/renderer/cache/gpuResourceManager.h index 24d32fecf..c50897f9e 100644 --- a/src/graphics/host_gpu/renderer/gpuResourceManager.h +++ b/src/graphics/host_gpu/renderer/cache/gpuResourceManager.h @@ -4,9 +4,9 @@ #include "common/abi.h" #include "common/common.h" #include "graphics/host_gpu/pageManager.h" -#include "graphics/host_gpu/renderer/bufferCache.h" -#include "graphics/host_gpu/renderer/resourceMutex.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include diff --git a/src/graphics/host_gpu/renderer/multiLevelPageTable.h b/src/graphics/host_gpu/renderer/cache/multiLevelPageTable.h similarity index 100% rename from src/graphics/host_gpu/renderer/multiLevelPageTable.h rename to src/graphics/host_gpu/renderer/cache/multiLevelPageTable.h diff --git a/src/graphics/host_gpu/renderer/resourceMutex.cpp b/src/graphics/host_gpu/renderer/cache/resourceMutex.cpp similarity index 97% rename from src/graphics/host_gpu/renderer/resourceMutex.cpp rename to src/graphics/host_gpu/renderer/cache/resourceMutex.cpp index 2a2ac4d7f..95dfe2a1c 100644 --- a/src/graphics/host_gpu/renderer/resourceMutex.cpp +++ b/src/graphics/host_gpu/renderer/cache/resourceMutex.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/resourceMutex.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" #include "common/assert.h" diff --git a/src/graphics/host_gpu/renderer/resourceMutex.h b/src/graphics/host_gpu/renderer/cache/resourceMutex.h similarity index 100% rename from src/graphics/host_gpu/renderer/resourceMutex.h rename to src/graphics/host_gpu/renderer/cache/resourceMutex.h diff --git a/src/graphics/host_gpu/renderer/samplerCache.cpp b/src/graphics/host_gpu/renderer/cache/samplerCache.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/samplerCache.cpp rename to src/graphics/host_gpu/renderer/cache/samplerCache.cpp index 34d37fe6d..a96eadc39 100644 --- a/src/graphics/host_gpu/renderer/samplerCache.cpp +++ b/src/graphics/host_gpu/renderer/cache/samplerCache.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/samplerCache.h" +#include "graphics/host_gpu/renderer/cache/samplerCache.h" #include "common/assert.h" #include "common/logging/log.h" diff --git a/src/graphics/host_gpu/renderer/samplerCache.h b/src/graphics/host_gpu/renderer/cache/samplerCache.h similarity index 100% rename from src/graphics/host_gpu/renderer/samplerCache.h rename to src/graphics/host_gpu/renderer/cache/samplerCache.h diff --git a/src/graphics/host_gpu/renderer/streamBuffer.cpp b/src/graphics/host_gpu/renderer/cache/streamBuffer.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/streamBuffer.cpp rename to src/graphics/host_gpu/renderer/cache/streamBuffer.cpp index 0517bf042..f9cd1adad 100644 --- a/src/graphics/host_gpu/renderer/streamBuffer.cpp +++ b/src/graphics/host_gpu/renderer/cache/streamBuffer.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/streamBuffer.h" +#include "graphics/host_gpu/renderer/cache/streamBuffer.h" #include "common/assert.h" #include "common/profiler.h" diff --git a/src/graphics/host_gpu/renderer/streamBuffer.h b/src/graphics/host_gpu/renderer/cache/streamBuffer.h similarity index 100% rename from src/graphics/host_gpu/renderer/streamBuffer.h rename to src/graphics/host_gpu/renderer/cache/streamBuffer.h diff --git a/src/graphics/host_gpu/renderer/textureCache.cpp b/src/graphics/host_gpu/renderer/cache/textureCache.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/textureCache.cpp rename to src/graphics/host_gpu/renderer/cache/textureCache.cpp index 3e06e0600..1a59369ac 100644 --- a/src/graphics/host_gpu/renderer/textureCache.cpp +++ b/src/graphics/host_gpu/renderer/cache/textureCache.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "common/assert.h" #include "common/emulatorConfig.h" @@ -7,13 +7,13 @@ #include "graphics/guest_gpu/gpu_format.h" #include "graphics/guest_gpu/tile.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/objects/textureCommon.h" -#include "graphics/host_gpu/renderer/bufferCache.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" #include "graphics/host_gpu/renderer/commandScheduler.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/render.h" -#include "graphics/host_gpu/renderer/resourceMutex.h" -#include "graphics/host_gpu/renderer/tiler.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" +#include "graphics/host_gpu/renderer/image/tiler.h" #include "kernel/memory.h" #include diff --git a/src/graphics/host_gpu/renderer/textureCache.h b/src/graphics/host_gpu/renderer/cache/textureCache.h similarity index 97% rename from src/graphics/host_gpu/renderer/textureCache.h rename to src/graphics/host_gpu/renderer/cache/textureCache.h index 6dc8c3bc7..c1e40e454 100644 --- a/src/graphics/host_gpu/renderer/textureCache.h +++ b/src/graphics/host_gpu/renderer/cache/textureCache.h @@ -5,9 +5,9 @@ #include "common/common.h" #include "common/lruCache.h" #include "graphics/host_gpu/memoryTracker.h" -#include "graphics/host_gpu/renderer/blitHelper.h" -#include "graphics/host_gpu/renderer/image.h" -#include "graphics/host_gpu/renderer/multiLevelPageTable.h" +#include "graphics/host_gpu/renderer/image/blitHelper.h" +#include "graphics/host_gpu/renderer/image/image.h" +#include "graphics/host_gpu/renderer/cache/multiLevelPageTable.h" #include #include diff --git a/src/graphics/host_gpu/renderer/colorRenderTarget.cpp b/src/graphics/host_gpu/renderer/colorRenderTarget.cpp index c28391097..c64fcda27 100644 --- a/src/graphics/host_gpu/renderer/colorRenderTarget.cpp +++ b/src/graphics/host_gpu/renderer/colorRenderTarget.cpp @@ -7,9 +7,9 @@ #include "graphics/guest_gpu/hardwareContext.h" #include "graphics/guest_gpu/tile.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/objects/textureCommon.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" #include "graphics/host_gpu/renderer/debug.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/host_gpu/vulkanCommon.h" diff --git a/src/graphics/host_gpu/renderer/colorRenderTarget.h b/src/graphics/host_gpu/renderer/colorRenderTarget.h index 2ddc00911..33cafb5ff 100644 --- a/src/graphics/host_gpu/renderer/colorRenderTarget.h +++ b/src/graphics/host_gpu/renderer/colorRenderTarget.h @@ -3,7 +3,7 @@ #include "graphics/guest_gpu/gpu_defs.h" #include "graphics/host_gpu/renderer/renderTarget.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "graphics/host_gpu/vulkanCommon.h" #include diff --git a/src/graphics/host_gpu/renderer/context.cpp b/src/graphics/host_gpu/renderer/context.cpp index 0648641eb..114345460 100644 --- a/src/graphics/host_gpu/renderer/context.cpp +++ b/src/graphics/host_gpu/renderer/context.cpp @@ -8,8 +8,8 @@ #include "graphics/host_gpu/renderer/colorRenderTarget.h" #include "graphics/host_gpu/renderer/debug.h" #include "graphics/host_gpu/renderer/depthRenderTarget.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/host_gpu/vma.h" diff --git a/src/graphics/host_gpu/renderer/depthRenderTarget.cpp b/src/graphics/host_gpu/renderer/depthRenderTarget.cpp index 502f73ba6..bdb0c5577 100644 --- a/src/graphics/host_gpu/renderer/depthRenderTarget.cpp +++ b/src/graphics/host_gpu/renderer/depthRenderTarget.cpp @@ -10,10 +10,10 @@ #include "graphics/guest_gpu/hardwareContext.h" #include "graphics/guest_gpu/tile.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/objects/textureCommon.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" #include "graphics/host_gpu/renderer/debug.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/host_gpu/vulkanCommon.h" diff --git a/src/graphics/host_gpu/renderer/depthRenderTarget.h b/src/graphics/host_gpu/renderer/depthRenderTarget.h index 4b4898d65..987f00d01 100644 --- a/src/graphics/host_gpu/renderer/depthRenderTarget.h +++ b/src/graphics/host_gpu/renderer/depthRenderTarget.h @@ -2,9 +2,9 @@ #define EMULATOR_SRC_GRAPHICS_HOST_GPU_RENDERER_DEPTHRENDERTARGET_H_ #include "common/assert.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/renderTarget.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "graphics/host_gpu/vulkanCommon.h" #include diff --git a/src/graphics/host_gpu/renderer/blitHelper.cpp b/src/graphics/host_gpu/renderer/image/blitHelper.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/blitHelper.cpp rename to src/graphics/host_gpu/renderer/image/blitHelper.cpp index 354083a46..70ee4a364 100644 --- a/src/graphics/host_gpu/renderer/blitHelper.cpp +++ b/src/graphics/host_gpu/renderer/image/blitHelper.cpp @@ -1,11 +1,11 @@ -#include "graphics/host_gpu/renderer/blitHelper.h" +#include "graphics/host_gpu/renderer/image/blitHelper.h" #include "common/assert.h" #include "gpu_blit_shaders/gpu_blit_color_to_ms_depth_spv.h" #include "gpu_blit_shaders/gpu_blit_fs_triangle_spv.h" #include "graphics/host_gpu/graphicContext.h" #include "graphics/host_gpu/renderer/commandScheduler.h" -#include "graphics/host_gpu/renderer/image.h" +#include "graphics/host_gpu/renderer/image/image.h" #include "graphics/host_gpu/renderer/renderTarget.h" #include diff --git a/src/graphics/host_gpu/renderer/blitHelper.h b/src/graphics/host_gpu/renderer/image/blitHelper.h similarity index 100% rename from src/graphics/host_gpu/renderer/blitHelper.h rename to src/graphics/host_gpu/renderer/image/blitHelper.h diff --git a/src/graphics/host_gpu/renderer/image.cpp b/src/graphics/host_gpu/renderer/image/image.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/image.cpp rename to src/graphics/host_gpu/renderer/image/image.cpp index ee0809b52..464a0bb54 100644 --- a/src/graphics/host_gpu/renderer/image.cpp +++ b/src/graphics/host_gpu/renderer/image/image.cpp @@ -1,11 +1,11 @@ -#include "graphics/host_gpu/renderer/image.h" +#include "graphics/host_gpu/renderer/image/image.h" #include "common/assert.h" #include "common/profiler.h" #include "graphics/host_gpu/renderer/commandScheduler.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/renderTarget.h" -#include "graphics/host_gpu/renderer/streamBuffer.h" +#include "graphics/host_gpu/renderer/cache/streamBuffer.h" #include "kernel/memory.h" #include diff --git a/src/graphics/host_gpu/renderer/image.h b/src/graphics/host_gpu/renderer/image/image.h similarity index 99% rename from src/graphics/host_gpu/renderer/image.h rename to src/graphics/host_gpu/renderer/image/image.h index 24e66b2ff..789119841 100644 --- a/src/graphics/host_gpu/renderer/image.h +++ b/src/graphics/host_gpu/renderer/image/image.h @@ -3,7 +3,7 @@ #include "common/assert.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/renderer/imageInfo.h" +#include "graphics/host_gpu/renderer/image/imageInfo.h" #include #include diff --git a/src/graphics/host_gpu/renderer/imageInfo.h b/src/graphics/host_gpu/renderer/image/imageInfo.h similarity index 100% rename from src/graphics/host_gpu/renderer/imageInfo.h rename to src/graphics/host_gpu/renderer/image/imageInfo.h diff --git a/src/graphics/host_gpu/renderer/imageView.cpp b/src/graphics/host_gpu/renderer/image/imageView.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/imageView.cpp rename to src/graphics/host_gpu/renderer/image/imageView.cpp index 7c926a6bc..d777a7154 100644 --- a/src/graphics/host_gpu/renderer/imageView.cpp +++ b/src/graphics/host_gpu/renderer/image/imageView.cpp @@ -1,8 +1,8 @@ -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "common/assert.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/renderer/image.h" +#include "graphics/host_gpu/renderer/image/image.h" #include diff --git a/src/graphics/host_gpu/renderer/imageView.h b/src/graphics/host_gpu/renderer/image/imageView.h similarity index 98% rename from src/graphics/host_gpu/renderer/imageView.h rename to src/graphics/host_gpu/renderer/image/imageView.h index 4dfdd1538..949cc6a41 100644 --- a/src/graphics/host_gpu/renderer/imageView.h +++ b/src/graphics/host_gpu/renderer/image/imageView.h @@ -2,8 +2,8 @@ #define EMULATOR_SRC_GRAPHICS_HOST_GPU_RENDERER_IMAGEVIEW_H_ #include "common/assert.h" -#include "graphics/host_gpu/renderer/imageInfo.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/host_gpu/renderer/image/imageInfo.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shader.h" namespace Libs::Graphics { diff --git a/src/graphics/host_gpu/objects/textureCommon.cpp b/src/graphics/host_gpu/renderer/image/textureCommon.cpp similarity index 99% rename from src/graphics/host_gpu/objects/textureCommon.cpp rename to src/graphics/host_gpu/renderer/image/textureCommon.cpp index 391e27b4d..55936cb21 100644 --- a/src/graphics/host_gpu/objects/textureCommon.cpp +++ b/src/graphics/host_gpu/renderer/image/textureCommon.cpp @@ -1,9 +1,9 @@ -#include "graphics/host_gpu/objects/textureCommon.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" #include "common/assert.h" #include "graphics/guest_gpu/gpu_defs.h" #include "graphics/guest_gpu/gpu_format.h" -#include "graphics/host_gpu/renderer/tiler.h" +#include "graphics/host_gpu/renderer/image/tiler.h" #include "graphics/host_gpu/vulkanCommon.h" #include diff --git a/src/graphics/host_gpu/objects/textureCommon.h b/src/graphics/host_gpu/renderer/image/textureCommon.h similarity index 89% rename from src/graphics/host_gpu/objects/textureCommon.h rename to src/graphics/host_gpu/renderer/image/textureCommon.h index 69f76f88a..66a945caf 100644 --- a/src/graphics/host_gpu/objects/textureCommon.h +++ b/src/graphics/host_gpu/renderer/image/textureCommon.h @@ -1,5 +1,5 @@ -#ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_OBJECTS_TEXTURECOMMON_H_ -#define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_OBJECTS_TEXTURECOMMON_H_ +#ifndef EMULATOR_INCLUDE_EMULATOR_GRAPHICS_HOST_GPU_RENDERER_IMAGE_TEXTURECOMMON_H_ +#define EMULATOR_INCLUDE_EMULATOR_GRAPHICS_HOST_GPU_RENDERER_IMAGE_TEXTURECOMMON_H_ #include "common/abi.h" #include "common/common.h" @@ -51,4 +51,4 @@ bool TextureBuildGpuTileInfos(uint64_t size, } // namespace Libs::Graphics -#endif /* EMULATOR_INCLUDE_EMULATOR_GRAPHICS_OBJECTS_TEXTURECOMMON_H_ */ +#endif /* EMULATOR_INCLUDE_EMULATOR_GRAPHICS_HOST_GPU_RENDERER_IMAGE_TEXTURECOMMON_H_ */ diff --git a/src/graphics/host_gpu/renderer/tiler.cpp b/src/graphics/host_gpu/renderer/image/tiler.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/tiler.cpp rename to src/graphics/host_gpu/renderer/image/tiler.cpp index dacaa5d03..59cbc30a1 100644 --- a/src/graphics/host_gpu/renderer/tiler.cpp +++ b/src/graphics/host_gpu/renderer/image/tiler.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/tiler.h" +#include "graphics/host_gpu/renderer/image/tiler.h" #include "common/assert.h" #include "gpu_tiler_shaders/gpu_tiler_demote_d16_spv.h" @@ -15,8 +15,8 @@ #include "gpu_tiler_shaders/gpu_tiler_swap_bgra16_spv.h" #include "graphics/host_gpu/graphicContext.h" #include "graphics/host_gpu/renderer/commandScheduler.h" -#include "graphics/host_gpu/renderer/image.h" -#include "graphics/host_gpu/renderer/streamBuffer.h" +#include "graphics/host_gpu/renderer/image/image.h" +#include "graphics/host_gpu/renderer/cache/streamBuffer.h" #include #include diff --git a/src/graphics/host_gpu/renderer/tiler.h b/src/graphics/host_gpu/renderer/image/tiler.h similarity index 100% rename from src/graphics/host_gpu/renderer/tiler.h rename to src/graphics/host_gpu/renderer/image/tiler.h diff --git a/src/graphics/host_gpu/renderer/descriptorCache.cpp b/src/graphics/host_gpu/renderer/pipeline/descriptorCache.cpp similarity index 98% rename from src/graphics/host_gpu/renderer/descriptorCache.cpp rename to src/graphics/host_gpu/renderer/pipeline/descriptorCache.cpp index 490eae412..fcd5917fd 100644 --- a/src/graphics/host_gpu/renderer/descriptorCache.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/descriptorCache.cpp @@ -1,8 +1,8 @@ -#include "graphics/host_gpu/renderer/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" #include "common/assert.h" #include "common/profiler.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include diff --git a/src/graphics/host_gpu/renderer/descriptorCache.h b/src/graphics/host_gpu/renderer/pipeline/descriptorCache.h similarity index 98% rename from src/graphics/host_gpu/renderer/descriptorCache.h rename to src/graphics/host_gpu/renderer/pipeline/descriptorCache.h index 9511e3e13..061030b7a 100644 --- a/src/graphics/host_gpu/renderer/descriptorCache.h +++ b/src/graphics/host_gpu/renderer/pipeline/descriptorCache.h @@ -6,7 +6,7 @@ #include "common/common.h" #include "common/threads.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "graphics/host_gpu/vulkanCommon.h" #include "graphics/shader/shaderBindings.h" diff --git a/src/graphics/host_gpu/renderer/descriptors.cpp b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp similarity index 98% rename from src/graphics/host_gpu/renderer/descriptors.cpp rename to src/graphics/host_gpu/renderer/pipeline/descriptors.cpp index df58d1aeb..49edf9ed7 100644 --- a/src/graphics/host_gpu/renderer/descriptors.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/descriptors.h" +#include "graphics/host_gpu/renderer/pipeline/descriptors.h" #include "common/assert.h" #include "common/common.h" @@ -14,18 +14,18 @@ #include "graphics/guest_gpu/tile.h" #include "graphics/host_gpu/graphicContext.h" #include "graphics/host_gpu/hostMemory.h" -#include "graphics/host_gpu/objects/textureCommon.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" #include "graphics/host_gpu/renderer/debug.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" -#include "graphics/host_gpu/renderer/shaderResourceBarrier.h" +#include "graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h" #include "graphics/host_gpu/vma.h" #include "graphics/host_gpu/vulkanCommon.h" -#include "graphics/shader/recompiler/BindingLayout.h" -#include "graphics/shader/recompiler/ResourceMaterialization.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/BindingLayout.h" +#include "graphics/shader/recompiler/ir/ResourceMaterialization.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shader.h" #include diff --git a/src/graphics/host_gpu/renderer/descriptors.h b/src/graphics/host_gpu/renderer/pipeline/descriptors.h similarity index 94% rename from src/graphics/host_gpu/renderer/descriptors.h rename to src/graphics/host_gpu/renderer/pipeline/descriptors.h index 722c34911..abccd5af1 100644 --- a/src/graphics/host_gpu/renderer/descriptors.h +++ b/src/graphics/host_gpu/renderer/pipeline/descriptors.h @@ -2,9 +2,9 @@ #define EMULATOR_SRC_GRAPHICS_HOST_GPU_RENDERER_DESCRIPTORS_H_ #include "common/assert.h" -#include "graphics/host_gpu/renderer/image.h" +#include "graphics/host_gpu/renderer/image/image.h" #include "graphics/host_gpu/vulkanCommon.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shaderBindings.h" #include diff --git a/src/graphics/host_gpu/renderer/pipelineCache.cpp b/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp similarity index 98% rename from src/graphics/host_gpu/renderer/pipelineCache.cpp rename to src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp index 9e8080184..6c8e43205 100644 --- a/src/graphics/host_gpu/renderer/pipelineCache.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/pipelineCache.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/pipelineCache.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" #include "common/assert.h" #include "common/logging/log.h" @@ -7,7 +7,7 @@ #include "graphics/host_gpu/renderer/colorRenderTarget.h" #include "graphics/host_gpu/renderer/debug.h" #include "graphics/host_gpu/renderer/depthRenderTarget.h" -#include "graphics/host_gpu/renderer/imageView.h" +#include "graphics/host_gpu/renderer/image/imageView.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" diff --git a/src/graphics/host_gpu/renderer/pipelineCache.h b/src/graphics/host_gpu/renderer/pipeline/pipelineCache.h similarity index 100% rename from src/graphics/host_gpu/renderer/pipelineCache.h rename to src/graphics/host_gpu/renderer/pipeline/pipelineCache.h diff --git a/src/graphics/host_gpu/renderer/shaderResourceBarrier.cpp b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp similarity index 98% rename from src/graphics/host_gpu/renderer/shaderResourceBarrier.cpp rename to src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp index d65e7a737..254c6adea 100644 --- a/src/graphics/host_gpu/renderer/shaderResourceBarrier.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/shaderResourceBarrier.h" +#include "graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h" #include "common/assert.h" #include "graphics/shader/shader.h" diff --git a/src/graphics/host_gpu/renderer/shaderResourceBarrier.h b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h similarity index 94% rename from src/graphics/host_gpu/renderer/shaderResourceBarrier.h rename to src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h index 3f7a53141..4744a7783 100644 --- a/src/graphics/host_gpu/renderer/shaderResourceBarrier.h +++ b/src/graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h @@ -2,7 +2,7 @@ #define EMULATOR_SRC_GRAPHICS_HOST_GPU_RENDERER_SHADERRESOURCEBARRIER_H_ #include "graphics/host_gpu/graphicContext.h" -#include "graphics/shader/recompiler/ResourceMaterialization.h" +#include "graphics/shader/recompiler/ir/ResourceMaterialization.h" #include diff --git a/src/graphics/host_gpu/renderer/shaderSubgroup.cpp b/src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.cpp similarity index 95% rename from src/graphics/host_gpu/renderer/shaderSubgroup.cpp rename to src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.cpp index 832ca57ec..f96b8cc88 100644 --- a/src/graphics/host_gpu/renderer/shaderSubgroup.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.cpp @@ -1,6 +1,6 @@ -#include "graphics/host_gpu/renderer/shaderSubgroup.h" +#include "graphics/host_gpu/renderer/pipeline/shaderSubgroup.h" -#include "graphics/shader/recompiler/SpirvEmitter.h" +#include "graphics/shader/recompiler/emitter/SpirvEmitter.h" namespace Libs::Graphics { diff --git a/src/graphics/host_gpu/renderer/shaderSubgroup.h b/src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.h similarity index 96% rename from src/graphics/host_gpu/renderer/shaderSubgroup.h rename to src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.h index f60f295e1..96b382f62 100644 --- a/src/graphics/host_gpu/renderer/shaderSubgroup.h +++ b/src/graphics/host_gpu/renderer/pipeline/shaderSubgroup.h @@ -2,7 +2,7 @@ #define EMULATOR_SRC_GRAPHICS_HOST_GPU_RENDERER_SHADERSUBGROUP_H_ #include "graphics/host_gpu/graphicContext.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" namespace Libs::Graphics { diff --git a/src/graphics/host_gpu/renderer/shaders.cpp b/src/graphics/host_gpu/renderer/pipeline/shaders.cpp similarity index 99% rename from src/graphics/host_gpu/renderer/shaders.cpp rename to src/graphics/host_gpu/renderer/pipeline/shaders.cpp index 3255d83e5..6a48be337 100644 --- a/src/graphics/host_gpu/renderer/shaders.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/shaders.cpp @@ -6,14 +6,14 @@ #include "graphics/guest_gpu/gpu_defs.h" #include "graphics/host_gpu/graphicContext.h" #include "graphics/host_gpu/renderer/debug.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/pipelineCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/host_gpu/renderer/renderTarget.h" -#include "graphics/host_gpu/renderer/shaderSubgroup.h" +#include "graphics/host_gpu/renderer/pipeline/shaderSubgroup.h" #include "graphics/host_gpu/vulkanCommon.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shader.h" #include diff --git a/src/graphics/host_gpu/renderer/render.h b/src/graphics/host_gpu/renderer/render.h index 264b71bca..5c5bd3115 100644 --- a/src/graphics/host_gpu/renderer/render.h +++ b/src/graphics/host_gpu/renderer/render.h @@ -4,7 +4,7 @@ #include "common/abi.h" #include "common/assert.h" #include "common/common.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" #include "graphics/host_gpu/renderer/renderTarget.h" #include "graphics/host_gpu/vulkanCommon.h" diff --git a/src/graphics/host_gpu/renderer/renderCompute.cpp b/src/graphics/host_gpu/renderer/renderCompute.cpp index 649f8c444..ed0959f88 100644 --- a/src/graphics/host_gpu/renderer/renderCompute.cpp +++ b/src/graphics/host_gpu/renderer/renderCompute.cpp @@ -10,17 +10,17 @@ #include "graphics/guest_gpu/graphicsRun.h" #include "graphics/guest_gpu/hardwareContext.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/descriptors.h" -#include "graphics/host_gpu/renderer/imageInfo.h" -#include "graphics/host_gpu/renderer/pipelineCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptors.h" +#include "graphics/host_gpu/renderer/image/imageInfo.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" -#include "graphics/host_gpu/renderer/shaderResourceBarrier.h" -#include "graphics/host_gpu/renderer/shaderSubgroup.h" +#include "graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h" +#include "graphics/host_gpu/renderer/pipeline/shaderSubgroup.h" #include "graphics/host_gpu/vulkanCommon.h" -#include "graphics/shader/recompiler/ResourceMaterialization.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ResourceMaterialization.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shader.h" #include "kernel/eventQueue.h" #include "kernel/pthread.h" diff --git a/src/graphics/host_gpu/renderer/renderContext.h b/src/graphics/host_gpu/renderer/renderContext.h index 69c0c6d95..83553e7a6 100644 --- a/src/graphics/host_gpu/renderer/renderContext.h +++ b/src/graphics/host_gpu/renderer/renderContext.h @@ -5,13 +5,13 @@ #include "common/assert.h" #include "common/common.h" #include "common/threads.h" -#include "graphics/host_gpu/renderer/bufferCache.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" #include "graphics/host_gpu/renderer/commandScheduler.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/gpuResourceManager.h" -#include "graphics/host_gpu/renderer/pipelineCache.h" -#include "graphics/host_gpu/renderer/samplerCache.h" -#include "graphics/host_gpu/renderer/textureCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/cache/gpuResourceManager.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" +#include "graphics/host_gpu/renderer/cache/samplerCache.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" #include "kernel/eventQueue.h" #include diff --git a/src/graphics/host_gpu/renderer/renderDraw.cpp b/src/graphics/host_gpu/renderer/renderDraw.cpp index dce3a2c9e..6b21b4962 100644 --- a/src/graphics/host_gpu/renderer/renderDraw.cpp +++ b/src/graphics/host_gpu/renderer/renderDraw.cpp @@ -16,15 +16,15 @@ #include "graphics/host_gpu/renderer/colorRenderTarget.h" #include "graphics/host_gpu/renderer/debug.h" #include "graphics/host_gpu/renderer/depthRenderTarget.h" -#include "graphics/host_gpu/renderer/descriptorCache.h" -#include "graphics/host_gpu/renderer/pipelineCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptorCache.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" -#include "graphics/host_gpu/renderer/shaderResourceBarrier.h" -#include "graphics/host_gpu/renderer/shaderSubgroup.h" +#include "graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h" +#include "graphics/host_gpu/renderer/pipeline/shaderSubgroup.h" #include "graphics/host_gpu/vulkanCommon.h" -#include "graphics/shader/recompiler/ResourceMaterialization.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ResourceMaterialization.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include "graphics/shader/shader.h" #include "kernel/eventQueue.h" #include "kernel/pthread.h" diff --git a/src/graphics/host_gpu/renderer/sync.cpp b/src/graphics/host_gpu/renderer/sync.cpp index b09070937..17a99cf74 100644 --- a/src/graphics/host_gpu/renderer/sync.cpp +++ b/src/graphics/host_gpu/renderer/sync.cpp @@ -5,7 +5,7 @@ #include "common/logging/log.h" #include "common/threads.h" #include "graphics/host_gpu/graphicContext.h" -#include "graphics/host_gpu/renderer/bufferCache.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/presentation/videoOut.h" diff --git a/src/graphics/presentation/videoOut.cpp b/src/graphics/presentation/videoOut.cpp index 03208e11a..27de6253c 100644 --- a/src/graphics/presentation/videoOut.cpp +++ b/src/graphics/presentation/videoOut.cpp @@ -12,7 +12,7 @@ #include "graphics/guest_gpu/gpu_defs.h" #include "graphics/guest_gpu/graphicsRun.h" #include "graphics/guest_gpu/tile.h" -#include "graphics/host_gpu/renderer/imageInfo.h" +#include "graphics/host_gpu/renderer/image/imageInfo.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/presentation/presenter.h" diff --git a/src/graphics/shader/recompiler/ShaderRecompiler.cpp b/src/graphics/shader/recompiler/ShaderRecompiler.cpp index 81aa968b9..7a44080a2 100644 --- a/src/graphics/shader/recompiler/ShaderRecompiler.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderRecompiler.h b/src/graphics/shader/recompiler/ShaderRecompiler.h index d06c391fa..bc1250008 100644 --- a/src/graphics/shader/recompiler/ShaderRecompiler.h +++ b/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 diff --git a/src/graphics/shader/recompiler/ShaderCFG.cpp b/src/graphics/shader/recompiler/cfg/ShaderCFG.cpp similarity index 99% rename from src/graphics/shader/recompiler/ShaderCFG.cpp rename to src/graphics/shader/recompiler/cfg/ShaderCFG.cpp index 176406755..d2ec9b97e 100644 --- a/src/graphics/shader/recompiler/ShaderCFG.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderCFG.h b/src/graphics/shader/recompiler/cfg/ShaderCFG.h similarity index 98% rename from src/graphics/shader/recompiler/ShaderCFG.h rename to src/graphics/shader/recompiler/cfg/ShaderCFG.h index 52a02cc07..afd4a7602 100644 --- a/src/graphics/shader/recompiler/ShaderCFG.h +++ b/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 diff --git a/src/graphics/shader/recompiler/ExportOps.cpp b/src/graphics/shader/recompiler/decompiler/ExportOps.cpp similarity index 96% rename from src/graphics/shader/recompiler/ExportOps.cpp rename to src/graphics/shader/recompiler/decompiler/ExportOps.cpp index 04db9c3e2..2e450e744 100644 --- a/src/graphics/shader/recompiler/ExportOps.cpp +++ b/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 diff --git a/src/graphics/shader/recompiler/ExportOps.h b/src/graphics/shader/recompiler/decompiler/ExportOps.h similarity index 88% rename from src/graphics/shader/recompiler/ExportOps.h rename to src/graphics/shader/recompiler/decompiler/ExportOps.h index 8a17b582b..3ccbedebe 100644 --- a/src/graphics/shader/recompiler/ExportOps.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ImageOps.cpp b/src/graphics/shader/recompiler/decompiler/ImageOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/ImageOps.cpp rename to src/graphics/shader/recompiler/decompiler/ImageOps.cpp index 0ed483aa7..1aaa3230c 100644 --- a/src/graphics/shader/recompiler/ImageOps.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ImageOps.h b/src/graphics/shader/recompiler/decompiler/ImageOps.h similarity index 89% rename from src/graphics/shader/recompiler/ImageOps.h rename to src/graphics/shader/recompiler/decompiler/ImageOps.h index 10bd28472..3f80d498c 100644 --- a/src/graphics/shader/recompiler/ImageOps.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/MemoryOps.cpp b/src/graphics/shader/recompiler/decompiler/MemoryOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/MemoryOps.cpp rename to src/graphics/shader/recompiler/decompiler/MemoryOps.cpp index b10dcd552..e09174081 100644 --- a/src/graphics/shader/recompiler/MemoryOps.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/MemoryOps.h b/src/graphics/shader/recompiler/decompiler/MemoryOps.h similarity index 94% rename from src/graphics/shader/recompiler/MemoryOps.h rename to src/graphics/shader/recompiler/decompiler/MemoryOps.h index 6e212ee51..5a2d5e514 100644 --- a/src/graphics/shader/recompiler/MemoryOps.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ScalarAluOps.cpp b/src/graphics/shader/recompiler/decompiler/ScalarAluOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/ScalarAluOps.cpp rename to src/graphics/shader/recompiler/decompiler/ScalarAluOps.cpp index 5b7792514..6d41dec1c 100644 --- a/src/graphics/shader/recompiler/ScalarAluOps.cpp +++ b/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 diff --git a/src/graphics/shader/recompiler/ScalarAluOps.h b/src/graphics/shader/recompiler/decompiler/ScalarAluOps.h similarity index 94% rename from src/graphics/shader/recompiler/ScalarAluOps.h rename to src/graphics/shader/recompiler/decompiler/ScalarAluOps.h index 3d073dd05..12b983d49 100644 --- a/src/graphics/shader/recompiler/ScalarAluOps.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ShaderDecoder.cpp b/src/graphics/shader/recompiler/decompiler/ShaderDecoder.cpp similarity index 99% rename from src/graphics/shader/recompiler/ShaderDecoder.cpp rename to src/graphics/shader/recompiler/decompiler/ShaderDecoder.cpp index b18da20c9..f79216ffd 100644 --- a/src/graphics/shader/recompiler/ShaderDecoder.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderDecoder.h b/src/graphics/shader/recompiler/decompiler/ShaderDecoder.h similarity index 100% rename from src/graphics/shader/recompiler/ShaderDecoder.h rename to src/graphics/shader/recompiler/decompiler/ShaderDecoder.h diff --git a/src/graphics/shader/recompiler/VectorAluOps.cpp b/src/graphics/shader/recompiler/decompiler/VectorAluOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/VectorAluOps.cpp rename to src/graphics/shader/recompiler/decompiler/VectorAluOps.cpp index f58fbff03..870f3d539 100644 --- a/src/graphics/shader/recompiler/VectorAluOps.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/VectorAluOps.h b/src/graphics/shader/recompiler/decompiler/VectorAluOps.h similarity index 94% rename from src/graphics/shader/recompiler/VectorAluOps.h rename to src/graphics/shader/recompiler/decompiler/VectorAluOps.h index dabb465d8..e1c01ab0b 100644 --- a/src/graphics/shader/recompiler/VectorAluOps.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/SpirvBuilder.cpp b/src/graphics/shader/recompiler/emitter/SpirvBuilder.cpp similarity index 99% rename from src/graphics/shader/recompiler/SpirvBuilder.cpp rename to src/graphics/shader/recompiler/emitter/SpirvBuilder.cpp index 031b52c48..b4885ff8d 100644 --- a/src/graphics/shader/recompiler/SpirvBuilder.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/SpirvBuilder.h b/src/graphics/shader/recompiler/emitter/SpirvBuilder.h similarity index 100% rename from src/graphics/shader/recompiler/SpirvBuilder.h rename to src/graphics/shader/recompiler/emitter/SpirvBuilder.h diff --git a/src/graphics/shader/recompiler/SpirvEmitter.cpp b/src/graphics/shader/recompiler/emitter/SpirvEmitter.cpp similarity index 99% rename from src/graphics/shader/recompiler/SpirvEmitter.cpp rename to src/graphics/shader/recompiler/emitter/SpirvEmitter.cpp index 278ba0aba..82868950e 100644 --- a/src/graphics/shader/recompiler/SpirvEmitter.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/SpirvEmitter.h b/src/graphics/shader/recompiler/emitter/SpirvEmitter.h similarity index 92% rename from src/graphics/shader/recompiler/SpirvEmitter.h rename to src/graphics/shader/recompiler/emitter/SpirvEmitter.h index 424cd0eaa..29bda92f0 100644 --- a/src/graphics/shader/recompiler/SpirvEmitter.h +++ b/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 diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAluOps.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterAluOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAluOps.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterAluOps.cpp index c9e508136..3cc1f5a27 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAluOps.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAnalysis.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterAnalysis.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAnalysis.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterAnalysis.cpp index 2dae22a7a..4cd2ee128 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterAnalysis.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterControlFlow.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterControlFlow.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterControlFlow.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterControlFlow.cpp index 10c2ddb1b..61989dc57 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterControlFlow.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterExport.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterExport.cpp similarity index 98% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterExport.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterExport.cpp index b8dd93069..edcce2b0d 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterExport.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterFlowOps.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterFlowOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterFlowOps.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterFlowOps.cpp index de875cd1f..4afe4f358 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterFlowOps.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageHelpers.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterImageHelpers.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageHelpers.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterImageHelpers.cpp index aff9be2d5..6bc297221 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageHelpers.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageOps.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterImageOps.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageOps.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterImageOps.cpp index 6bbb63553..3760f6175 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterImageOps.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h b/src/graphics/shader/recompiler/emitter/spirvEmitterInternal.h similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h rename to src/graphics/shader/recompiler/emitter/spirvEmitterInternal.h index ed0673518..5a51635c7 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h +++ b/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 #include diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterMemory.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterMemory.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterMemory.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterMemory.cpp index d7c553060..e46248cdc 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterMemory.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterModule.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterModule.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterModule.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterModule.cpp index 62f9ca4f4..0cfe87775 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterModule.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterValues.cpp b/src/graphics/shader/recompiler/emitter/spirvEmitterValues.cpp similarity index 99% rename from src/graphics/shader/recompiler/spirvEmitter/spirvEmitterValues.cpp rename to src/graphics/shader/recompiler/emitter/spirvEmitterValues.cpp index a299093d4..bed80d628 100644 --- a/src/graphics/shader/recompiler/spirvEmitter/spirvEmitterValues.cpp +++ b/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 { diff --git a/src/graphics/shader/recompiler/BindingLayout.cpp b/src/graphics/shader/recompiler/ir/BindingLayout.cpp similarity index 98% rename from src/graphics/shader/recompiler/BindingLayout.cpp rename to src/graphics/shader/recompiler/ir/BindingLayout.cpp index f1aedf3f6..f29d4a528 100644 --- a/src/graphics/shader/recompiler/BindingLayout.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/BindingLayout.h b/src/graphics/shader/recompiler/ir/BindingLayout.h similarity index 92% rename from src/graphics/shader/recompiler/BindingLayout.h rename to src/graphics/shader/recompiler/ir/BindingLayout.h index f82bea338..9a0e0a08c 100644 --- a/src/graphics/shader/recompiler/BindingLayout.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ResourceMaterialization.cpp b/src/graphics/shader/recompiler/ir/ResourceMaterialization.cpp similarity index 99% rename from src/graphics/shader/recompiler/ResourceMaterialization.cpp rename to src/graphics/shader/recompiler/ir/ResourceMaterialization.cpp index b9b2d5a2d..d318f50e7 100644 --- a/src/graphics/shader/recompiler/ResourceMaterialization.cpp +++ b/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" diff --git a/src/graphics/shader/recompiler/ResourceMaterialization.h b/src/graphics/shader/recompiler/ir/ResourceMaterialization.h similarity index 96% rename from src/graphics/shader/recompiler/ResourceMaterialization.h rename to src/graphics/shader/recompiler/ir/ResourceMaterialization.h index 7b40c7d53..b0ed6149e 100644 --- a/src/graphics/shader/recompiler/ResourceMaterialization.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ResourceTracking.cpp b/src/graphics/shader/recompiler/ir/ResourceTracking.cpp similarity index 99% rename from src/graphics/shader/recompiler/ResourceTracking.cpp rename to src/graphics/shader/recompiler/ir/ResourceTracking.cpp index e35bc70a8..db83c1fdc 100644 --- a/src/graphics/shader/recompiler/ResourceTracking.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ResourceTracking.h b/src/graphics/shader/recompiler/ir/ResourceTracking.h similarity index 91% rename from src/graphics/shader/recompiler/ResourceTracking.h rename to src/graphics/shader/recompiler/ir/ResourceTracking.h index 3bd17e519..f1fc4db77 100644 --- a/src/graphics/shader/recompiler/ResourceTracking.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/ScalarProvenance.cpp b/src/graphics/shader/recompiler/ir/ScalarProvenance.cpp similarity index 99% rename from src/graphics/shader/recompiler/ScalarProvenance.cpp rename to src/graphics/shader/recompiler/ir/ScalarProvenance.cpp index fa3e8ec7e..87c8165a5 100644 --- a/src/graphics/shader/recompiler/ScalarProvenance.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ScalarProvenance.h b/src/graphics/shader/recompiler/ir/ScalarProvenance.h similarity index 94% rename from src/graphics/shader/recompiler/ScalarProvenance.h rename to src/graphics/shader/recompiler/ir/ScalarProvenance.h index 55cada635..5597e1653 100644 --- a/src/graphics/shader/recompiler/ScalarProvenance.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/shaderIR/ShaderIR.cpp b/src/graphics/shader/recompiler/ir/ShaderIR.cpp similarity index 99% rename from src/graphics/shader/recompiler/shaderIR/ShaderIR.cpp rename to src/graphics/shader/recompiler/ir/ShaderIR.cpp index 73c55dccc..ac01d4f26 100644 --- a/src/graphics/shader/recompiler/shaderIR/ShaderIR.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderIR.h b/src/graphics/shader/recompiler/ir/ShaderIR.h similarity index 99% rename from src/graphics/shader/recompiler/ShaderIR.h rename to src/graphics/shader/recompiler/ir/ShaderIR.h index 72215d59b..c3fd2c577 100644 --- a/src/graphics/shader/recompiler/ShaderIR.h +++ b/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 diff --git a/src/graphics/shader/recompiler/shaderIR/ShaderIRInternal.h b/src/graphics/shader/recompiler/ir/ShaderIRInternal.h similarity index 98% rename from src/graphics/shader/recompiler/shaderIR/ShaderIRInternal.h rename to src/graphics/shader/recompiler/ir/ShaderIRInternal.h index e445536e9..8095a108c 100644 --- a/src/graphics/shader/recompiler/shaderIR/ShaderIRInternal.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/shaderIR/ShaderIRLog.cpp b/src/graphics/shader/recompiler/ir/ShaderIRLog.cpp similarity index 99% rename from src/graphics/shader/recompiler/shaderIR/ShaderIRLog.cpp rename to src/graphics/shader/recompiler/ir/ShaderIRLog.cpp index 0b72823c5..22785f5f2 100644 --- a/src/graphics/shader/recompiler/shaderIR/ShaderIRLog.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/shaderIR/ShaderIRMemory.cpp b/src/graphics/shader/recompiler/ir/ShaderIRMemory.cpp similarity index 99% rename from src/graphics/shader/recompiler/shaderIR/ShaderIRMemory.cpp rename to src/graphics/shader/recompiler/ir/ShaderIRMemory.cpp index bae97a498..5ff9c2c2b 100644 --- a/src/graphics/shader/recompiler/shaderIR/ShaderIRMemory.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/shaderIR/ShaderIROpcodes.cpp b/src/graphics/shader/recompiler/ir/ShaderIROpcodes.cpp similarity index 99% rename from src/graphics/shader/recompiler/shaderIR/ShaderIROpcodes.cpp rename to src/graphics/shader/recompiler/ir/ShaderIROpcodes.cpp index fa2b33dca..e137f2709 100644 --- a/src/graphics/shader/recompiler/shaderIR/ShaderIROpcodes.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderInfoCollection.cpp b/src/graphics/shader/recompiler/ir/ShaderInfoCollection.cpp similarity index 99% rename from src/graphics/shader/recompiler/ShaderInfoCollection.cpp rename to src/graphics/shader/recompiler/ir/ShaderInfoCollection.cpp index 67d8fbcea..667c61ec1 100644 --- a/src/graphics/shader/recompiler/ShaderInfoCollection.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/ShaderInfoCollection.h b/src/graphics/shader/recompiler/ir/ShaderInfoCollection.h similarity index 93% rename from src/graphics/shader/recompiler/ShaderInfoCollection.h rename to src/graphics/shader/recompiler/ir/ShaderInfoCollection.h index 5bd03cfc0..7e406db58 100644 --- a/src/graphics/shader/recompiler/ShaderInfoCollection.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/SrtPatcher.cpp b/src/graphics/shader/recompiler/ir/SrtPatcher.cpp similarity index 98% rename from src/graphics/shader/recompiler/SrtPatcher.cpp rename to src/graphics/shader/recompiler/ir/SrtPatcher.cpp index b28954de8..0cdc2ba17 100644 --- a/src/graphics/shader/recompiler/SrtPatcher.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/SrtPatcher.h b/src/graphics/shader/recompiler/ir/SrtPatcher.h similarity index 91% rename from src/graphics/shader/recompiler/SrtPatcher.h rename to src/graphics/shader/recompiler/ir/SrtPatcher.h index 90dedc5f0..b60376f96 100644 --- a/src/graphics/shader/recompiler/SrtPatcher.h +++ b/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 { diff --git a/src/graphics/shader/recompiler/SrtWalker.cpp b/src/graphics/shader/recompiler/ir/SrtWalker.cpp similarity index 99% rename from src/graphics/shader/recompiler/SrtWalker.cpp rename to src/graphics/shader/recompiler/ir/SrtWalker.cpp index 0297101a6..3b196c36d 100644 --- a/src/graphics/shader/recompiler/SrtWalker.cpp +++ b/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 #include diff --git a/src/graphics/shader/recompiler/SrtWalker.h b/src/graphics/shader/recompiler/ir/SrtWalker.h similarity index 97% rename from src/graphics/shader/recompiler/SrtWalker.h rename to src/graphics/shader/recompiler/ir/SrtWalker.h index 4a36befe1..d010d757f 100644 --- a/src/graphics/shader/recompiler/SrtWalker.h +++ b/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 #include diff --git a/src/graphics/shader/shader.cpp b/src/graphics/shader/shader.cpp index 3fe969472..649714699 100644 --- a/src/graphics/shader/shader.cpp +++ b/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" diff --git a/src/graphics/shader/shaderStageRuntime.cpp b/src/graphics/shader/shaderStageRuntime.cpp index 8cbe6f189..f06ac823c 100644 --- a/src/graphics/shader/shaderStageRuntime.cpp +++ b/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 diff --git a/src/kernel/memory.cpp b/src/kernel/memory.cpp index eae359ebf..bc48c5d9c 100644 --- a/src/kernel/memory.cpp +++ b/src/kernel/memory.cpp @@ -7,7 +7,7 @@ #include "common/threads.h" #include "common/virtualMemory.h" #include "graphics/guest_gpu/graphicsRun.h" -#include "graphics/host_gpu/renderer/gpuResourceManager.h" +#include "graphics/host_gpu/renderer/cache/gpuResourceManager.h" #include "libs/errno.h" #include "libs/libs.h" diff --git a/tests/ImagePageTableTests.cpp b/tests/ImagePageTableTests.cpp index 3eaebf7eb..bd8864c7b 100644 --- a/tests/ImagePageTableTests.cpp +++ b/tests/ImagePageTableTests.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/multiLevelPageTable.h" +#include "graphics/host_gpu/renderer/cache/multiLevelPageTable.h" #include #include diff --git a/tests/ResourceMutexTests.cpp b/tests/ResourceMutexTests.cpp index 773a3533a..54fe9ba7d 100644 --- a/tests/ResourceMutexTests.cpp +++ b/tests/ResourceMutexTests.cpp @@ -1,4 +1,4 @@ -#include "graphics/host_gpu/renderer/resourceMutex.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" #include #include diff --git a/tests/ResourceTrackingTests.cpp b/tests/ResourceTrackingTests.cpp index 8099dd1c7..3fd748020 100644 --- a/tests/ResourceTrackingTests.cpp +++ b/tests/ResourceTrackingTests.cpp @@ -1,11 +1,11 @@ #include "graphics/guest_gpu/gpu_defs.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/ShaderInfoCollection.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/ir/ShaderInfoCollection.h" +#include "graphics/shader/recompiler/ir/SrtPatcher.h" +#include "graphics/shader/recompiler/ir/SrtWalker.h" #include "graphics/shader/shaderBindings.h" #include diff --git a/tests/ScalarProvenanceTests.cpp b/tests/ScalarProvenanceTests.cpp index 3d802064f..f90a86ff3 100644 --- a/tests/ScalarProvenanceTests.cpp +++ b/tests/ScalarProvenanceTests.cpp @@ -1,5 +1,5 @@ -#include "graphics/shader/recompiler/ScalarProvenance.h" -#include "graphics/shader/recompiler/SrtWalker.h" +#include "graphics/shader/recompiler/ir/ScalarProvenance.h" +#include "graphics/shader/recompiler/ir/SrtWalker.h" #include #include diff --git a/tests/ShaderRecompilerComputeTests.cpp b/tests/ShaderRecompilerComputeTests.cpp index 239aca307..ae0df6354 100644 --- a/tests/ShaderRecompilerComputeTests.cpp +++ b/tests/ShaderRecompilerComputeTests.cpp @@ -13,32 +13,32 @@ #include "graphics/guest_gpu/tile.h" #include "graphics/host_gpu/hostMemory.h" #include "graphics/host_gpu/memoryTracker.h" -#include "graphics/host_gpu/objects/textureCommon.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" #include "graphics/host_gpu/pageManager.h" -#include "graphics/host_gpu/renderer/blitHelper.h" -#include "graphics/host_gpu/renderer/bufferCache.h" +#include "graphics/host_gpu/renderer/image/blitHelper.h" +#include "graphics/host_gpu/renderer/cache/bufferCache.h" #include "graphics/host_gpu/renderer/colorRenderTarget.h" #include "graphics/host_gpu/renderer/depthRenderTarget.h" -#include "graphics/host_gpu/renderer/descriptors.h" -#include "graphics/host_gpu/renderer/gpuResourceManager.h" -#include "graphics/host_gpu/renderer/image.h" -#include "graphics/host_gpu/renderer/imageView.h" -#include "graphics/host_gpu/renderer/pipelineCache.h" +#include "graphics/host_gpu/renderer/pipeline/descriptors.h" +#include "graphics/host_gpu/renderer/cache/gpuResourceManager.h" +#include "graphics/host_gpu/renderer/image/image.h" +#include "graphics/host_gpu/renderer/image/imageView.h" +#include "graphics/host_gpu/renderer/pipeline/pipelineCache.h" #include "graphics/host_gpu/renderer/render.h" #include "graphics/host_gpu/renderer/renderContext.h" #include "graphics/host_gpu/renderer/renderDraw.h" #include "graphics/host_gpu/renderer/renderTarget.h" -#include "graphics/host_gpu/renderer/resourceMutex.h" +#include "graphics/host_gpu/renderer/cache/resourceMutex.h" #include "graphics/host_gpu/renderer/sync.h" -#include "graphics/host_gpu/renderer/textureCache.h" -#include "graphics/host_gpu/renderer/tiler.h" +#include "graphics/host_gpu/renderer/cache/textureCache.h" +#include "graphics/host_gpu/renderer/image/tiler.h" #include "graphics/host_gpu/vulkanCommon.h" #include "graphics/presentation/window/windowInternal.h" -#include "graphics/shader/recompiler/BindingLayout.h" -#include "graphics/shader/recompiler/ShaderDecoder.h" +#include "graphics/shader/recompiler/ir/BindingLayout.h" +#include "graphics/shader/recompiler/decompiler/ShaderDecoder.h" #include "graphics/shader/recompiler/ShaderRecompiler.h" -#include "graphics/shader/recompiler/SpirvBuilder.h" -#include "graphics/shader/recompiler/SpirvEmitter.h" +#include "graphics/shader/recompiler/emitter/SpirvBuilder.h" +#include "graphics/shader/recompiler/emitter/SpirvEmitter.h" #include "graphics/shader/shader.h" #include "kernel/memory.h" diff --git a/tests/ShaderStageRuntimeTests.cpp b/tests/ShaderStageRuntimeTests.cpp index 586c23653..8c031cc44 100644 --- a/tests/ShaderStageRuntimeTests.cpp +++ b/tests/ShaderStageRuntimeTests.cpp @@ -1,7 +1,7 @@ #include "graphics/shader/shader.h" -#include "graphics/shader/recompiler/ResourceMaterialization.h" -#include "graphics/shader/recompiler/ShaderIR.h" +#include "graphics/shader/recompiler/ir/ResourceMaterialization.h" +#include "graphics/shader/recompiler/ir/ShaderIR.h" #include #include diff --git a/tests/shaderCfgTests.cpp b/tests/shaderCfgTests.cpp index 8ca8c0fe8..1a6f9db49 100644 --- a/tests/shaderCfgTests.cpp +++ b/tests/shaderCfgTests.cpp @@ -4,22 +4,22 @@ #include "common/threads.h" #include "graphics/guest_gpu/hardwareContext.h" #include "graphics/guest_gpu/pm4.h" -#include "graphics/host_gpu/objects/textureCommon.h" -#include "graphics/host_gpu/renderer/imageView.h" -#include "graphics/host_gpu/renderer/shaderResourceBarrier.h" -#include "graphics/host_gpu/renderer/shaderSubgroup.h" +#include "graphics/host_gpu/renderer/image/textureCommon.h" +#include "graphics/host_gpu/renderer/image/imageView.h" +#include "graphics/host_gpu/renderer/pipeline/shaderResourceBarrier.h" +#include "graphics/host_gpu/renderer/pipeline/shaderSubgroup.h" #include "graphics/shader/recompiler/ExecMask.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/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/ShaderRecompiler.h" -#include "graphics/shader/recompiler/SpirvEmitter.h" -#include "graphics/shader/recompiler/SrtPatcher.h" -#include "graphics/shader/recompiler/SrtWalker.h" -#include "graphics/shader/recompiler/spirvEmitter/spirvEmitterInternal.h" +#include "graphics/shader/recompiler/emitter/SpirvEmitter.h" +#include "graphics/shader/recompiler/ir/SrtPatcher.h" +#include "graphics/shader/recompiler/ir/SrtWalker.h" +#include "graphics/shader/recompiler/emitter/spirvEmitterInternal.h" #include "graphics/shader/shader.h" #include "libs/agc.h" #include "spirv-tools/libspirv.hpp"