diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index ee738ba4e3..5d9b81afac 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -93,6 +93,7 @@ add_library(common IOFile.h JitRegister.cpp JitRegister.h + JsonUtil.cpp JsonUtil.h JsonUtil.cpp Lazy.h diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index 97051d034d..d10f0f8897 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -670,17 +670,21 @@ + + - + + + @@ -706,26 +710,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + - - + + + + + + @@ -748,7 +789,17 @@ + + + + + + + + + + @@ -1332,15 +1383,18 @@ + - + + + @@ -1360,22 +1414,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + - - + + + + + @@ -1393,7 +1481,17 @@ + + + + + + + + + + diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index b4ba6ddf78..c2aa05d3ca 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -8,27 +8,34 @@ add_library(videocommon AbstractStagingTexture.h AbstractTexture.cpp AbstractTexture.h + Assets/AssetListener.h Assets/CustomAsset.cpp Assets/CustomAsset.h + Assets/CustomAssetCache.cpp + Assets/CustomAssetCache.h Assets/CustomAssetLibrary.h Assets/CustomAssetLoader.cpp Assets/CustomAssetLoader.h - Assets/CustomResourceManager.cpp - Assets/CustomResourceManager.h Assets/CustomTextureData.cpp Assets/CustomTextureData.h Assets/DirectFilesystemAssetLibrary.cpp Assets/DirectFilesystemAssetLibrary.h Assets/MaterialAsset.cpp Assets/MaterialAsset.h + Assets/MaterialAssetUtils.cpp + Assets/MaterialAssetUtils.h Assets/MeshAsset.cpp Assets/MeshAsset.h + Assets/RenderTargetAsset.cpp + Assets/RenderTargetAsset.h Assets/ShaderAsset.cpp Assets/ShaderAsset.h Assets/TextureAsset.cpp Assets/TextureAsset.h Assets/TextureAssetUtils.cpp Assets/TextureAssetUtils.h + Assets/TextureSamplerValue.cpp + Assets/TextureSamplerValue.h Assets/Types.h Assets/WatchableFilesystemAssetLibrary.h AsyncRequests.cpp @@ -71,41 +78,111 @@ add_library(videocommon GeometryShaderGen.h GeometryShaderManager.cpp GeometryShaderManager.h + GraphicsModEditor/Controls/AssetDisplay.cpp + GraphicsModEditor/Controls/AssetDisplay.h + GraphicsModEditor/Controls/CameraChoiceControl.cpp + GraphicsModEditor/Controls/CameraChoiceControl.h + GraphicsModEditor/Controls/MaterialControl.cpp + GraphicsModEditor/Controls/MaterialControl.h + GraphicsModEditor/Controls/MaterialGenerateWindow.cpp + GraphicsModEditor/Controls/MaterialGenerateWindow.h + GraphicsModEditor/Controls/MeshControl.cpp + GraphicsModEditor/Controls/MeshControl.h + GraphicsModEditor/Controls/MeshExtractWindow.cpp + GraphicsModEditor/Controls/MeshExtractWindow.h + GraphicsModEditor/Controls/MeshImportWindow.cpp + GraphicsModEditor/Controls/MeshImportWindow.h + GraphicsModEditor/Controls/MiscControls.cpp + GraphicsModEditor/Controls/MiscControls.h + GraphicsModEditor/Controls/RenderTargetControl.cpp + GraphicsModEditor/Controls/RenderTargetControl.h + GraphicsModEditor/Controls/ShaderControl.cpp + GraphicsModEditor/Controls/ShaderControl.h + GraphicsModEditor/Controls/TagSelectionWindow.cpp + GraphicsModEditor/Controls/TagSelectionWindow.h + GraphicsModEditor/Controls/TextureControl.cpp + GraphicsModEditor/Controls/TextureControl.h + GraphicsModEditor/EditorAssetSource.cpp + GraphicsModEditor/EditorAssetSource.h + GraphicsModEditor/EditorBackend.cpp + GraphicsModEditor/EditorBackend.h + GraphicsModEditor/EditorEvents.h + GraphicsModEditor/EditorFilter.cpp + GraphicsModEditor/EditorFilter.h + GraphicsModEditor/EditorMain.cpp + GraphicsModEditor/EditorMain.h + GraphicsModEditor/EditorState.cpp + GraphicsModEditor/EditorState.h + GraphicsModEditor/EditorTypes.h + GraphicsModEditor/GpuSkinningDataDumper.cpp + GraphicsModEditor/GpuSkinningDataDumper.h + GraphicsModEditor/GpuSkinningDataUtils.cpp + GraphicsModEditor/GpuSkinningDataUtils.h + GraphicsModEditor/MaterialGeneration.cpp + GraphicsModEditor/MaterialGeneration.h + GraphicsModEditor/Panels/ActiveTargetsPanel.cpp + GraphicsModEditor/Panels/ActiveTargetsPanel.h + GraphicsModEditor/Panels/AssetBrowserPanel.cpp + GraphicsModEditor/Panels/AssetBrowserPanel.h + GraphicsModEditor/Panels/PropertiesPanel.cpp + GraphicsModEditor/Panels/PropertiesPanel.h + GraphicsModEditor/RenderTargetGeneration.cpp + GraphicsModEditor/RenderTargetGeneration.h + GraphicsModEditor/SceneDumper.cpp + GraphicsModEditor/SceneDumper.h + GraphicsModEditor/SceneUtils.cpp + GraphicsModEditor/SceneUtils.h + GraphicsModEditor/ShaderGeneration.cpp + GraphicsModEditor/ShaderGeneration.h GraphicsModSystem/Config/GraphicsMod.cpp GraphicsModSystem/Config/GraphicsMod.h + GraphicsModSystem/Config/GraphicsModAction.cpp + GraphicsModSystem/Config/GraphicsModAction.h GraphicsModSystem/Config/GraphicsModAsset.cpp GraphicsModSystem/Config/GraphicsModAsset.h - GraphicsModSystem/Config/GraphicsModFeature.cpp - GraphicsModSystem/Config/GraphicsModFeature.h GraphicsModSystem/Config/GraphicsModGroup.cpp GraphicsModSystem/Config/GraphicsModGroup.h + GraphicsModSystem/Config/GraphicsModHashPolicy.cpp + GraphicsModSystem/Config/GraphicsModHashPolicy.h + GraphicsModSystem/Config/GraphicsModTag.cpp + GraphicsModSystem/Config/GraphicsModTag.h GraphicsModSystem/Config/GraphicsTarget.cpp GraphicsModSystem/Config/GraphicsTarget.h - GraphicsModSystem/Config/GraphicsTargetGroup.cpp - GraphicsModSystem/Config/GraphicsTargetGroup.h GraphicsModSystem/Constants.h + GraphicsModSystem/Runtime/Actions/CustomMeshAction.cpp + GraphicsModSystem/Runtime/Actions/CustomMeshAction.h GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h + GraphicsModSystem/Runtime/Actions/ModifyLight.cpp + GraphicsModSystem/Runtime/Actions/ModifyLight.h GraphicsModSystem/Runtime/Actions/MoveAction.cpp GraphicsModSystem/Runtime/Actions/MoveAction.h GraphicsModSystem/Runtime/Actions/PrintAction.cpp GraphicsModSystem/Runtime/Actions/PrintAction.h + GraphicsModSystem/Runtime/Actions/RelativeCameraAction.cpp + GraphicsModSystem/Runtime/Actions/RelativeCameraAction.h GraphicsModSystem/Runtime/Actions/ScaleAction.cpp GraphicsModSystem/Runtime/Actions/ScaleAction.h GraphicsModSystem/Runtime/Actions/SkipAction.cpp GraphicsModSystem/Runtime/Actions/SkipAction.h - GraphicsModSystem/Runtime/CustomPipeline.cpp - GraphicsModSystem/Runtime/CustomPipeline.h - GraphicsModSystem/Runtime/CustomShaderCache.cpp - GraphicsModSystem/Runtime/CustomShaderCache.h + GraphicsModSystem/Runtime/Actions/TransformAction.cpp + GraphicsModSystem/Runtime/Actions/TransformAction.h + GraphicsModSystem/Runtime/CameraManager.cpp + GraphicsModSystem/Runtime/CameraManager.h GraphicsModSystem/Runtime/FBInfo.cpp GraphicsModSystem/Runtime/FBInfo.h GraphicsModSystem/Runtime/GraphicsModAction.h GraphicsModSystem/Runtime/GraphicsModActionData.h GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp GraphicsModSystem/Runtime/GraphicsModActionFactory.h + GraphicsModSystem/Runtime/GraphicsModBackend.cpp + GraphicsModSystem/Runtime/GraphicsModBackend.h + GraphicsModSystem/Runtime/GraphicsModHash.cpp + GraphicsModSystem/Runtime/GraphicsModHash.h GraphicsModSystem/Runtime/GraphicsModManager.cpp GraphicsModSystem/Runtime/GraphicsModManager.h + GraphicsModSystem/Runtime/GraphicsModRuntimeBackend.cpp + GraphicsModSystem/Runtime/GraphicsModRuntimeBackend.h HiresTextures.cpp HiresTextures.h IndexGenerator.cpp @@ -143,8 +220,28 @@ add_library(videocommon Present.h RenderState.cpp RenderState.h + Resources/CustomResourceManager.cpp + Resources/CustomResourceManager.h + Resources/MaterialResource.cpp + Resources/MaterialResource.h + Resources/MeshResource.cpp + Resources/MeshResource.h + Resources/RenderTargetResource.cpp + Resources/RenderTargetResource.h + Resources/Resource.cpp + Resources/Resource.h + Resources/ShaderResource.cpp + Resources/ShaderResource.h + Resources/TextureAndSamplerResource.cpp + Resources/TextureAndSamplerResource.h + Resources/TextureDataResource.cpp + Resources/TextureDataResource.h + Resources/TexturePool.cpp + Resources/TexturePool.h ShaderCache.cpp ShaderCache.h + ShaderCacheUtils.cpp + ShaderCacheUtils.h ShaderGenCommon.cpp ShaderGenCommon.h Spirv.cpp