From 8f90332eded5d74489b7034db58a8f92c5df7f86 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 28 Dec 2017 15:48:32 -0800 Subject: Removed legacy VS project and solution files, updated project dependencies. --- .../GhostCubePlugin/PluginSource/CMakeLists.txt | 2 + .../PluginSource/build/UWP/EngineRoot.props | 29 --- .../PluginSource/build/UWP/GhostCubePlugin.vcxproj | 282 --------------------- .../build/UWP/GhostCubePlugin.vcxproj.filters | 6 - .../PluginSource/build/Win32/EngineRoot.props | 29 --- .../build/Win32/GhostCubePlugin.vcxproj | 202 --------------- .../build/Win32/GhostCubePlugin.vcxproj.filters | 6 - .../Windows.Shared/GhostCubePlugin.Shared.vcxitems | 38 --- .../GhostCubePlugin.Shared.vcxitems.filters | 39 --- .../build/Windows.Shared/GhostCubePlugin.props | 16 -- .../GhostCubePlugin/PluginSource/src/RenderAPI.cpp | 2 +- .../PluginSource/src/RenderAPI_D3D12.cpp | 2 +- 12 files changed, 4 insertions(+), 649 deletions(-) delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/UWP/EngineRoot.props delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj.filters delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/EngineRoot.props delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems.filters delete mode 100644 unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.props (limited to 'unityplugin/GhostCubePlugin/PluginSource') diff --git a/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt b/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt index 40a7740..02a43ea 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt +++ b/unityplugin/GhostCubePlugin/PluginSource/CMakeLists.txt @@ -61,6 +61,8 @@ target_link_libraries(GhostCubePlugin-shared PRIVATE BuildSettings TargetPlatform + Common + GraphicsAccessories GraphicsTools ) diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/EngineRoot.props b/unityplugin/GhostCubePlugin/PluginSource/build/UWP/EngineRoot.props deleted file mode 100644 index 95f31c5..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/EngineRoot.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - ..\.. - $(ProjectRoot)\..\..\.. - $(EngineRoot)\diligentcore - $(EngineRoot)\diligenttools - - - - - - $(ProjectRoot) - - - $(TerrainRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(ToolsRoot) - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj b/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj deleted file mode 100644 index c374b65..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj +++ /dev/null @@ -1,282 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - - {0ba2f2ac-6c53-4ce5-aa37-9c6ded067096} - DirectXApp - GhostCubePlugin - en-US - 14.0 - true - Windows Store - 10.0.10586.0 - 10.0.10240.0 - 10.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - true - - - DynamicLibrary - false - true - v140 - true - - - DynamicLibrary - false - true - v140 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GhostCubePlugin_TemporaryKey.pfx - - - - - - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;_DEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;NDEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\ARM - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;_DEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86 - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;NDEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x86 - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;_DEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64 - - - - - d3d12.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64 - ..\..\src\RenderingPlugin.def - - - pch.h - $(IntDir)pch.pch - $(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - WINDOWS_UWP;UNITY_METRO;_WINDLL;NDEBUG;%(PreprocessorDefinitions) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\Metro\UWP\x64 - - - - - {6de3eb2b-8a56-4d27-8a39-587f7a70584c} - - - {29acd2a7-4c49-4973-9673-8f57ef37070f} - - - {1a5a1c1d-c717-4680-a929-40e6324fe048} - - - {acd6f956-ff3b-4fe9-8be3-c0eecfdbbf93} - - - {dfe6435d-cc9d-4ca1-bf4e-5640c522d815} - - - {7a1a6e2c-3952-4a57-ad30-abd92aa39c69} - - - {ff7d4949-dc3e-488b-8f78-1d32f1ca3b4c} - - - {91adc1dd-aa8e-492a-ac19-3e0dab9ad665} - - - - - - - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj.filters b/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj.filters deleted file mode 100644 index 26ca0eb..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/UWP/GhostCubePlugin.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/EngineRoot.props b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/EngineRoot.props deleted file mode 100644 index 95f31c5..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/EngineRoot.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - ..\.. - $(ProjectRoot)\..\..\.. - $(EngineRoot)\diligentcore - $(EngineRoot)\diligenttools - - - - - - $(ProjectRoot) - - - $(TerrainRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(ToolsRoot) - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj deleted file mode 100644 index e12e345..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - {7380f7e6-315f-4b4e-92eb-e6aeee865298} - - - {fe289cc7-15d6-4a76-b9cb-f61cab3192c9} - - - {fff8071a-db82-485b-adc3-f0b675296869} - - - {40fd58ed-aabc-4cbd-bee4-33116995a626} - - - {15e346d3-fde6-4b29-88b7-fca14dada501} - - - {052dd700-477c-4512-a7f4-b05ebef5c80e} - - - {c6014499-0cf2-43ec-a773-a4e354fb2d74} - - - {1a782154-a5bd-4a05-b837-efc77f126c84} - - - {8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c} - - - {58f32677-436b-412a-bbf8-2b1310d82cd8} - - - - - - - {EDA960FC-AA6C-44B3-8ABB-90765DA4D516} - Win32Proj - GhostCubePlugin - 10.0.10586.0 - - - - DynamicLibrary - true - v140 - Unicode - - - DynamicLibrary - true - v140 - Unicode - - - DynamicLibrary - false - v140 - true - Unicode - - - DynamicLibrary - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - ..\..\src\RenderingPlugin.def - dxgi.lib;d3d12.lib;d3d11.lib;d3dcompiler.lib;opengl32.lib;%(AdditionalDependencies) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86 - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - ..\..\src\RenderingPlugin.def - dxgi.lib;d3d12.lib;d3d11.lib;d3dcompiler.lib;opengl32.lib;%(AdditionalDependencies) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64 - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - ..\..\src\RenderingPlugin.def - dxgi.lib;d3d12.lib;d3d11.lib;d3dcompiler.lib;opengl32.lib;%(AdditionalDependencies) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86 - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - ..\..\src\RenderingPlugin.def - dxgi.lib;d3d12.lib;d3d11.lib;d3dcompiler.lib;opengl32.lib;%(AdditionalDependencies) - - - copy $(OutDir)$(TargetName).dll $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64\$(ProjectName).dll -copy $(OutDir)$(TargetName).pdb $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64\$(ProjectName).pdb - copying $(TargetName).dll and $(TargetName).pdb to $(ProjectRoot)\..\UnityProject\Assets\Plugins\x86_64 - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters b/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters deleted file mode 100644 index 26ca0eb..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Win32/GhostCubePlugin.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems b/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems deleted file mode 100644 index 6cda2ea..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems +++ /dev/null @@ -1,38 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {27b0c157-0a7a-46b0-aed3-919e7af5ef4b} - TerrainCore - GhostCubePlugin.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems.filters b/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems.filters deleted file mode 100644 index faac556..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.Shared.vcxitems.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {1cabdf31-0e7d-4669-8f9a-fe963ebfd442} - - - - - Unity - - - Unity - - - Unity - - - Unity - - - Unity - - - Unity - - - - - - - - - - - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.props b/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.props deleted file mode 100644 index 343679b..0000000 --- a/unityplugin/GhostCubePlugin/PluginSource/build/Windows.Shared/GhostCubePlugin.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - $(CoreRoot)\Graphics\GraphicsEngine\interface;$(CoreRoot)\Graphics\GraphicsEngineD3D11\interface;$(CoreRoot)\Graphics\GraphicsEngineD3D12\interface;$(CoreRoot)\Graphics\GraphicsEngineOpenGL\interface;$(CoreRoot)\Graphics\HLSL2GLSLConverterLib\interface;$(CoreRoot)\Common\include;$(CoreRoot)\Common\interface;$(CoreRoot)\Platforms\interface;$(CoreRoot)\Graphics\GraphicsTools\include;$(IncludePath) - $(SolutionDir)\bin\DLLs\$(PlatformShortName)\ - $(ProjectName)_$(ConfigSuffix) - - - - NotUsing - - - - \ No newline at end of file diff --git a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI.cpp b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI.cpp index 18278e7..a46d275 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI.cpp +++ b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI.cpp @@ -1,7 +1,7 @@ #include "RenderAPI.h" #include "PlatformBase.h" #include "Unity/IUnityGraphics.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" using namespace Diligent; diff --git a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp index a29c492..daea7a6 100644 --- a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp +++ b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp @@ -50,7 +50,7 @@ public: { auto NextFenceValue = m_pUnityGraphicsD3D12->GetNextFrameFenceValue(); m_CurrentFenceValue = m_pUnityGraphicsD3D12->ExecuteCommandList(commandList, static_cast(m_ResourcesToTransition.size()), m_ResourcesToTransition.empty() ? nullptr : m_ResourcesToTransition.data()); - VERIFY(m_CurrentFenceValue >= NextFenceValue, "Current fence value returned by ExecuteCommandList() is less than the next fence value previously queried through GetNextFrameFenceValue()") + VERIFY(m_CurrentFenceValue >= NextFenceValue, "Current fence value returned by ExecuteCommandList() is less than the next fence value previously queried through GetNextFrameFenceValue()"); m_ResourcesToTransition.clear(); return std::max(m_CurrentFenceValue, NextFenceValue); } -- cgit v1.2.3