mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-14 10:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

VK: move helpers to vkutils

Browse Source
This commit is contained in:
Megamouse 2020-12-30 10:32:54 +01:00 committed by Ivan
parent d9eb31000d
commit 7a51b7a019
28 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/CMakeLists.txt
View File

@ -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

2
rpcs3/Emu/RSX/VK/VKCommandStream.cpp
View File

@ -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"

2
rpcs3/Emu/RSX/VK/VKFragmentProgram.h
View File

@ -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
{

16
rpcs3/Emu/RSX/VK/VKHelpers.h
View File

@ -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

2
rpcs3/Emu/RSX/VK/VKOverlays.h
View File

@ -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"

2
rpcs3/Emu/RSX/VK/VKPipelineCompiler.h
View File

@ -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
{

4
rpcs3/Emu/RSX/VK/VKResourceManager.h
View File

@ -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 <unordered_map>
#include <deque>

2
rpcs3/Emu/RSX/VK/VKVertexProgram.h
View File

@ -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
{

0
rpcs3/Emu/RSX/VK/helpers/chip_class.cpp → rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/chip_class.h → rpcs3/Emu/RSX/VK/vkutils/chip_class.h
View File

0
rpcs3/Emu/RSX/VK/helpers/fence.cpp → rpcs3/Emu/RSX/VK/vkutils/fence.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/fence.h → rpcs3/Emu/RSX/VK/vkutils/fence.h
View File

0
rpcs3/Emu/RSX/VK/helpers/graphics_pipeline_state.h → rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.h
View File

0
rpcs3/Emu/RSX/VK/helpers/mem_allocator.cpp → rpcs3/Emu/RSX/VK/vkutils/mem_allocator.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/mem_allocator.h → rpcs3/Emu/RSX/VK/vkutils/mem_allocator.h
View File

0
rpcs3/Emu/RSX/VK/helpers/memory_block.cpp → rpcs3/Emu/RSX/VK/vkutils/memory_block.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/memory_block.h → rpcs3/Emu/RSX/VK/vkutils/memory_block.h
View File

0
rpcs3/Emu/RSX/VK/helpers/physical_device.cpp → rpcs3/Emu/RSX/VK/vkutils/physical_device.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/physical_device.h → rpcs3/Emu/RSX/VK/vkutils/physical_device.h
View File

0
rpcs3/Emu/RSX/VK/helpers/pipeline_binding_table.h → rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h
View File

0
rpcs3/Emu/RSX/VK/helpers/query_pool.h → rpcs3/Emu/RSX/VK/vkutils/query_pool.h
View File

0
rpcs3/Emu/RSX/VK/helpers/sampler.cpp → rpcs3/Emu/RSX/VK/vkutils/sampler.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/sampler.h → rpcs3/Emu/RSX/VK/vkutils/sampler.h
View File

0
rpcs3/Emu/RSX/VK/helpers/shared.cpp → rpcs3/Emu/RSX/VK/vkutils/shared.cpp
View File

0
rpcs3/Emu/RSX/VK/helpers/shared.h → rpcs3/Emu/RSX/VK/vkutils/shared.h
View File

0
rpcs3/Emu/RSX/VK/helpers/supported_extensions.h → rpcs3/Emu/RSX/VK/vkutils/supported_extensions.h
View File

36
rpcs3/VKGSRender.vcxproj
View File

@ -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" />

74
rpcs3/VKGSRender.vcxproj.filters
View File

@ -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">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\chip_class.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\fence.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\fence.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\mem_allocator.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\mem_allocator.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\memory_block.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\memory_block.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\physical_device.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\physical_device.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\sampler.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\sampler.cpp">
<Filter>vkutils</Filter>
</ClCompile>
<ClCompile Include="Emu\RSX\VK\helpers\shared.cpp">
<Filter>helpers</Filter>
<ClCompile Include="Emu\RSX\VK\vkutils\shared.cpp">
<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">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\chip_class.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\fence.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\fence.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\graphics_pipeline_state.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\graphics_pipeline_state.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\mem_allocator.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\mem_allocator.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\memory_block.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\memory_block.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\physical_device.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\physical_device.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\pipeline_binding_table.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\pipeline_binding_table.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\query_pool.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\query_pool.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\sampler.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\sampler.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\shared.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\shared.h">
<Filter>vkutils</Filter>
</ClInclude>
<ClInclude Include="Emu\RSX\VK\helpers\supported_extensions.h">
<Filter>helpers</Filter>
<ClInclude Include="Emu\RSX\VK\vkutils\supported_extensions.h">
<Filter>vkutils</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="helpers">
<Filter Include="vkutils">
<UniqueIdentifier>{2c6cb5a5-ed99-44fe-a0b6-7ba1949c8b29}</UniqueIdentifier>
</Filter>
</ItemGroup>