From 7a51b7a0199dbb687a37c77f6da4bbae8083f9ee Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 30 Dec 2020 10:32:54 +0100 Subject: [PATCH] VK: move helpers to vkutils --- rpcs3/Emu/CMakeLists.txt | 14 ++-- rpcs3/Emu/RSX/VK/VKCommandStream.cpp | 2 +- rpcs3/Emu/RSX/VK/VKFragmentProgram.h | 2 +- rpcs3/Emu/RSX/VK/VKHelpers.h | 16 ++-- rpcs3/Emu/RSX/VK/VKOverlays.h | 2 +- rpcs3/Emu/RSX/VK/VKPipelineCompiler.h | 2 +- rpcs3/Emu/RSX/VK/VKResourceManager.h | 4 +- rpcs3/Emu/RSX/VK/VKVertexProgram.h | 2 +- .../VK/{helpers => vkutils}/chip_class.cpp | 0 .../RSX/VK/{helpers => vkutils}/chip_class.h | 0 .../Emu/RSX/VK/{helpers => vkutils}/fence.cpp | 0 rpcs3/Emu/RSX/VK/{helpers => vkutils}/fence.h | 0 .../graphics_pipeline_state.h | 0 .../VK/{helpers => vkutils}/mem_allocator.cpp | 0 .../VK/{helpers => vkutils}/mem_allocator.h | 0 .../VK/{helpers => vkutils}/memory_block.cpp | 0 .../VK/{helpers => vkutils}/memory_block.h | 0 .../{helpers => vkutils}/physical_device.cpp | 0 .../VK/{helpers => vkutils}/physical_device.h | 0 .../pipeline_binding_table.h | 0 .../RSX/VK/{helpers => vkutils}/query_pool.h | 0 .../RSX/VK/{helpers => vkutils}/sampler.cpp | 0 .../Emu/RSX/VK/{helpers => vkutils}/sampler.h | 0 .../RSX/VK/{helpers => vkutils}/shared.cpp | 0 .../Emu/RSX/VK/{helpers => vkutils}/shared.h | 0 .../supported_extensions.h | 0 rpcs3/VKGSRender.vcxproj | 36 ++++----- rpcs3/VKGSRender.vcxproj.filters | 74 +++++++++---------- 28 files changed, 77 insertions(+), 77 deletions(-) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/chip_class.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/chip_class.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/fence.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/fence.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/graphics_pipeline_state.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/mem_allocator.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/mem_allocator.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/memory_block.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/memory_block.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/physical_device.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/physical_device.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/pipeline_binding_table.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/query_pool.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/sampler.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/sampler.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/shared.cpp (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/shared.h (100%) rename rpcs3/Emu/RSX/VK/{helpers => vkutils}/supported_extensions.h (100%) diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 60a5cfdb29..247cadbde8 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -435,13 +435,13 @@ target_sources(rpcs3_emu PRIVATE if(TARGET 3rdparty_vulkan) target_sources(rpcs3_emu PRIVATE - RSX/VK/helpers/chip_class.cpp - RSX/VK/helpers/fence.cpp - RSX/VK/helpers/mem_allocator.cpp - RSX/VK/helpers/memory_block.cpp - RSX/VK/helpers/physical_device.cpp - RSX/VK/helpers/sampler.cpp - RSX/VK/helpers/shared.cpp + RSX/VK/vkutils/chip_class.cpp + RSX/VK/vkutils/fence.cpp + RSX/VK/vkutils/mem_allocator.cpp + RSX/VK/vkutils/memory_block.cpp + RSX/VK/vkutils/physical_device.cpp + RSX/VK/vkutils/sampler.cpp + RSX/VK/vkutils/shared.cpp RSX/VK/VKCommandStream.cpp RSX/VK/VKCommonDecompiler.cpp RSX/VK/VKDMA.cpp diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp index 231f7371f9..a55dbc23d5 100644 --- a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommandStream.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "VKCommandStream.h" -#include "helpers/fence.h" +#include "vkutils/fence.h" #include "Emu/IdManager.h" #include "Emu/system_config.h" #include "Emu/RSX/RSXOffload.h" diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h index 3ac31a8607..8d25998c88 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h @@ -4,7 +4,7 @@ #include "Emu/RSX/RSXFragmentProgram.h" #include "VulkanAPI.h" #include "VKProgramPipeline.h" -#include "helpers/pipeline_binding_table.h" +#include "vkutils/pipeline_binding_table.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 00ca2e4927..72dc73d628 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -21,14 +21,14 @@ #include "../Common/TextureUtils.h" #include "../display.h" #include "../rsx_utils.h" -#include "helpers/chip_class.h" -#include "helpers/fence.h" -#include "helpers/mem_allocator.h" -#include "helpers/memory_block.h" -#include "helpers/physical_device.h" -#include "helpers/pipeline_binding_table.h" -#include "helpers/shared.h" -#include "helpers/supported_extensions.h" +#include "vkutils/chip_class.h" +#include "vkutils/fence.h" +#include "vkutils/mem_allocator.h" +#include "vkutils/memory_block.h" +#include "vkutils/physical_device.h" +#include "vkutils/pipeline_binding_table.h" +#include "vkutils/shared.h" +#include "vkutils/supported_extensions.h" #ifdef __APPLE__ #define VK_DISABLE_COMPONENT_SWIZZLE 1 diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h index e3bcaa6b0d..d22a8b0a40 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.h +++ b/rpcs3/Emu/RSX/VK/VKOverlays.h @@ -7,7 +7,7 @@ #include "VKResourceManager.h" #include "VKRenderPass.h" #include "VKPipelineCompiler.h" -#include "helpers/sampler.h" +#include "vkutils/sampler.h" #include "../Overlays/overlays.h" diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h index 3365a93c9e..aec671bb22 100644 --- a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h +++ b/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h @@ -3,7 +3,7 @@ #include "Utilities/hash.h" #include "Utilities/lockless.h" #include "VKProgramPipeline.h" -#include "helpers/graphics_pipeline_state.h" +#include "vkutils/graphics_pipeline_state.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/Emu/RSX/VK/VKResourceManager.h index 21aad9624d..ec25a11452 100644 --- a/rpcs3/Emu/RSX/VK/VKResourceManager.h +++ b/rpcs3/Emu/RSX/VK/VKResourceManager.h @@ -1,7 +1,7 @@ #pragma once #include "VKHelpers.h" -#include "helpers/query_pool.h" -#include "helpers/sampler.h" +#include "vkutils/query_pool.h" +#include "vkutils/sampler.h" #include #include diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/Emu/RSX/VK/VKVertexProgram.h index 00acb955b6..fb47125d94 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.h +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.h @@ -4,7 +4,7 @@ #include "Utilities/Thread.h" #include "VulkanAPI.h" #include "VKProgramPipeline.h" -#include "helpers/pipeline_binding_table.h" +#include "vkutils/pipeline_binding_table.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/helpers/chip_class.cpp b/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/chip_class.cpp rename to rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/chip_class.h b/rpcs3/Emu/RSX/VK/vkutils/chip_class.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/chip_class.h rename to rpcs3/Emu/RSX/VK/vkutils/chip_class.h diff --git a/rpcs3/Emu/RSX/VK/helpers/fence.cpp b/rpcs3/Emu/RSX/VK/vkutils/fence.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/fence.cpp rename to rpcs3/Emu/RSX/VK/vkutils/fence.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/fence.h b/rpcs3/Emu/RSX/VK/vkutils/fence.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/fence.h rename to rpcs3/Emu/RSX/VK/vkutils/fence.h diff --git a/rpcs3/Emu/RSX/VK/helpers/graphics_pipeline_state.h b/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/graphics_pipeline_state.h rename to rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.h diff --git a/rpcs3/Emu/RSX/VK/helpers/mem_allocator.cpp b/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/mem_allocator.cpp rename to rpcs3/Emu/RSX/VK/vkutils/mem_allocator.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/mem_allocator.h b/rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/mem_allocator.h rename to rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h diff --git a/rpcs3/Emu/RSX/VK/helpers/memory_block.cpp b/rpcs3/Emu/RSX/VK/vkutils/memory_block.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/memory_block.cpp rename to rpcs3/Emu/RSX/VK/vkutils/memory_block.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/memory_block.h b/rpcs3/Emu/RSX/VK/vkutils/memory_block.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/memory_block.h rename to rpcs3/Emu/RSX/VK/vkutils/memory_block.h diff --git a/rpcs3/Emu/RSX/VK/helpers/physical_device.cpp b/rpcs3/Emu/RSX/VK/vkutils/physical_device.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/physical_device.cpp rename to rpcs3/Emu/RSX/VK/vkutils/physical_device.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/physical_device.h b/rpcs3/Emu/RSX/VK/vkutils/physical_device.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/physical_device.h rename to rpcs3/Emu/RSX/VK/vkutils/physical_device.h diff --git a/rpcs3/Emu/RSX/VK/helpers/pipeline_binding_table.h b/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/pipeline_binding_table.h rename to rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h diff --git a/rpcs3/Emu/RSX/VK/helpers/query_pool.h b/rpcs3/Emu/RSX/VK/vkutils/query_pool.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/query_pool.h rename to rpcs3/Emu/RSX/VK/vkutils/query_pool.h diff --git a/rpcs3/Emu/RSX/VK/helpers/sampler.cpp b/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/sampler.cpp rename to rpcs3/Emu/RSX/VK/vkutils/sampler.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/sampler.h b/rpcs3/Emu/RSX/VK/vkutils/sampler.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/sampler.h rename to rpcs3/Emu/RSX/VK/vkutils/sampler.h diff --git a/rpcs3/Emu/RSX/VK/helpers/shared.cpp b/rpcs3/Emu/RSX/VK/vkutils/shared.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/shared.cpp rename to rpcs3/Emu/RSX/VK/vkutils/shared.cpp diff --git a/rpcs3/Emu/RSX/VK/helpers/shared.h b/rpcs3/Emu/RSX/VK/vkutils/shared.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/shared.h rename to rpcs3/Emu/RSX/VK/vkutils/shared.h diff --git a/rpcs3/Emu/RSX/VK/helpers/supported_extensions.h b/rpcs3/Emu/RSX/VK/vkutils/supported_extensions.h similarity index 100% rename from rpcs3/Emu/RSX/VK/helpers/supported_extensions.h rename to rpcs3/Emu/RSX/VK/vkutils/supported_extensions.h diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index f2fe8a21e7..03c281dfb5 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -19,17 +19,6 @@ - - - - - - - - - - - @@ -51,17 +40,21 @@ + + + + + + + + + + + - - - - - - - @@ -80,6 +73,13 @@ + + + + + + + diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/VKGSRender.vcxproj.filters index 0ebc0e962d..9d4f9b1605 100644 --- a/rpcs3/VKGSRender.vcxproj.filters +++ b/rpcs3/VKGSRender.vcxproj.filters @@ -23,26 +23,26 @@ - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils @@ -69,42 +69,42 @@ - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - - helpers + + vkutils - + {2c6cb5a5-ed99-44fe-a0b6-7ba1949c8b29}