VK: move helpers to vkutils

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/vkutils/chip_class.cpp
-		RSX/VK/helpers/fence.cpp
+		RSX/VK/vkutils/fence.cpp
-		RSX/VK/helpers/mem_allocator.cpp
+		RSX/VK/vkutils/mem_allocator.cpp
-		RSX/VK/helpers/memory_block.cpp
+		RSX/VK/vkutils/memory_block.cpp
-		RSX/VK/helpers/physical_device.cpp
+		RSX/VK/vkutils/physical_device.cpp
-		RSX/VK/helpers/sampler.cpp
+		RSX/VK/vkutils/sampler.cpp
-		RSX/VK/helpers/shared.cpp
+		RSX/VK/vkutils/shared.cpp
 		RSX/VK/VKCommandStream.cpp
 		RSX/VK/VKCommonDecompiler.cpp
 		RSX/VK/VKDMA.cpp

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"

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
 {

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 "vkutils/chip_class.h"
-#include "helpers/fence.h"
+#include "vkutils/fence.h"
-#include "helpers/mem_allocator.h"
+#include "vkutils/mem_allocator.h"
-#include "helpers/memory_block.h"
+#include "vkutils/memory_block.h"
-#include "helpers/physical_device.h"
+#include "vkutils/physical_device.h"
-#include "helpers/pipeline_binding_table.h"
+#include "vkutils/pipeline_binding_table.h"
-#include "helpers/shared.h"
+#include "vkutils/shared.h"
-#include "helpers/supported_extensions.h"
+#include "vkutils/supported_extensions.h"
 
 #ifdef __APPLE__
 #define VK_DISABLE_COMPONENT_SWIZZLE 1

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"
 

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
 {

rpcs3/Emu/RSX/VK/VKResourceManager.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "VKHelpers.h"
-#include "helpers/query_pool.h"
+#include "vkutils/query_pool.h"
-#include "helpers/sampler.h"
+#include "vkutils/sampler.h"
 
 #include <unordered_map>
 #include <deque>

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
 {

rpcs3/VKGSRender.vcxproj

@@ -19,17 +19,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Emu\RSX\VK\helpers\chip_class.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\fence.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\graphics_pipeline_state.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\memory_block.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\mem_allocator.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\physical_device.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\pipeline_binding_table.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\query_pool.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\sampler.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\shared.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\supported_extensions.h" />
     <ClInclude Include="Emu\RSX\VK\VKCommandStream.h" />
     <ClInclude Include="Emu\RSX\VK\VKCommonDecompiler.h" />
     <ClInclude Include="Emu\RSX\VK\VKCompute.h" />
@@ -51,17 +40,21 @@
     <ClInclude Include="Emu\RSX\VK\VKShaderInterpreter.h" />
     <ClInclude Include="Emu\RSX\VK\VKTextOut.h" />
     <ClInclude Include="Emu\RSX\VK\VKTextureCache.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\chip_class.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\fence.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\graphics_pipeline_state.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\memory_block.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\mem_allocator.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\physical_device.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\pipeline_binding_table.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\query_pool.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\sampler.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\shared.h" />
+    <ClInclude Include="Emu\RSX\VK\vkutils\supported_extensions.h" />
     <ClInclude Include="Emu\RSX\VK\VKVertexProgram.h" />
     <ClInclude Include="Emu\RSX\VK\VulkanAPI.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Emu\RSX\VK\helpers\chip_class.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\fence.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\memory_block.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\mem_allocator.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\physical_device.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\sampler.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\shared.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKCommandStream.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKCommonDecompiler.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKDMA.cpp" />
@@ -80,6 +73,13 @@
     <ClCompile Include="Emu\RSX\VK\VKResourceManager.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKShaderInterpreter.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKTexture.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\chip_class.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\fence.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\memory_block.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\mem_allocator.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\physical_device.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\sampler.cpp" />
+    <ClCompile Include="Emu\RSX\VK\vkutils\shared.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKVertexBuffers.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKVertexProgram.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKTextureCache.cpp" />

rpcs3/VKGSRender.vcxproj.filters

@@ -23,26 +23,26 @@
     <ClCompile Include="Emu\RSX\VK\VKCommandStream.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKQueryPool.cpp" />
     <ClCompile Include="Emu\RSX\VK\VKPipelineCompiler.cpp" />
-    <ClCompile Include="Emu\RSX\VK\helpers\chip_class.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\chip_class.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\fence.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\fence.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\mem_allocator.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\mem_allocator.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\memory_block.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\memory_block.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\physical_device.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\physical_device.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\sampler.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\sampler.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\VK\helpers\shared.cpp">
+    <ClCompile Include="Emu\RSX\VK\vkutils\shared.cpp">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -69,42 +69,42 @@
     <ClInclude Include="Emu\RSX\VK\VKQueryPool.h" />
     <ClInclude Include="Emu\RSX\VK\VKPipelineCompiler.h" />
     <ClInclude Include="Emu\RSX\VK\VKProgramPipeline.h" />
-    <ClInclude Include="Emu\RSX\VK\helpers\chip_class.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\chip_class.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\fence.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\fence.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\graphics_pipeline_state.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\graphics_pipeline_state.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\mem_allocator.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\mem_allocator.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\memory_block.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\memory_block.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\physical_device.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\physical_device.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\pipeline_binding_table.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\pipeline_binding_table.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\query_pool.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\query_pool.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\sampler.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\sampler.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\shared.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\shared.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\VK\helpers\supported_extensions.h">
+    <ClInclude Include="Emu\RSX\VK\vkutils\supported_extensions.h">
-      <Filter>helpers</Filter>
+      <Filter>vkutils</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <Filter Include="helpers">
+    <Filter Include="vkutils">
       <UniqueIdentifier>{2c6cb5a5-ed99-44fe-a0b6-7ba1949c8b29}</UniqueIdentifier>
     </Filter>
   </ItemGroup>