From 901d1ad3fb765fe7d0865507d9cc4ca01ef6a8f4 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 19 Aug 2026 11:48:39 +0000 Subject: [PATCH 1/8] Fix compile warnings/errors when building with v145 --- trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp | 2 +- trinity/Eve/SpaceObject/EveMissileWarhead.cpp | 2 +- trinity/Tr2DepthStencil.cpp | 2 +- trinity/Tr2DepthStencil.h | 2 +- trinity/Tr2RenderTarget.cpp | 4 ++-- trinity/Tr2RenderTarget.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp index ba6334b74..652442526 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp @@ -577,7 +577,7 @@ void EveChildCloud2::PopulatePerObjectData( PerObjectData& data, float screenSiz if( radius > 0 ) { data.lights[i].innerRadius = std::max( std::min( light->GetLightData().innerRadius / radius, 1.f ), 0.f ); - data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3 ); + data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3.f ); } else { diff --git a/trinity/Eve/SpaceObject/EveMissileWarhead.cpp b/trinity/Eve/SpaceObject/EveMissileWarhead.cpp index 542626a8b..f686ea291 100644 --- a/trinity/Eve/SpaceObject/EveMissileWarhead.cpp +++ b/trinity/Eve/SpaceObject/EveMissileWarhead.cpp @@ -553,7 +553,7 @@ void EveMissileWarhead::UpdateWarhead( float deltaT, float estimatedTotalAliveTi // override some behaviour for bombs if( m_bombFlightpath ) { - const float bombTrackBall = pow( 1.f - quickFlight01, 2 ); + const float bombTrackBall = pow( 1.f - quickFlight01, 2.f ); m_currentOffset *= bombTrackBall; } diff --git a/trinity/Tr2DepthStencil.cpp b/trinity/Tr2DepthStencil.cpp index 5f5e135ec..00920e313 100644 --- a/trinity/Tr2DepthStencil.cpp +++ b/trinity/Tr2DepthStencil.cpp @@ -46,7 +46,7 @@ void Tr2DepthStencil::py__init__( } } -long Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags ) +int32_t Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags ) { USE_MAIN_THREAD_RENDER_CONTEXT(); auto gpuUsage = Tr2GpuUsage::DEPTH_STENCIL | Tr2GpuUsage::SHADER_RESOURCE; diff --git a/trinity/Tr2DepthStencil.h b/trinity/Tr2DepthStencil.h index 3ad0d56b4..ddaeac80c 100644 --- a/trinity/Tr2DepthStencil.h +++ b/trinity/Tr2DepthStencil.h @@ -37,7 +37,7 @@ BLUE_CLASS( Tr2DepthStencil ) : Be::OptionalWithDefaultValue msaaQuality, Be::OptionalWithDefaultValue flags ); - long Create( + int32_t Create( unsigned width, unsigned height, Tr2RenderContextEnum::DepthStencilFormat format, diff --git a/trinity/Tr2RenderTarget.cpp b/trinity/Tr2RenderTarget.cpp index d1d6e9942..d3422a544 100644 --- a/trinity/Tr2RenderTarget.cpp +++ b/trinity/Tr2RenderTarget.cpp @@ -357,14 +357,14 @@ bool Tr2RenderTarget::IsReadable() const return GetRenderTarget().IsValid() && Tr2GpuUsage::HasFlag( GetRenderTarget().GetGpuUsage(), Tr2GpuUsage::SHADER_RESOURCE ); } -long Tr2RenderTarget::GenerateMipMaps() +int32_t Tr2RenderTarget::GenerateMipMaps() { CCP_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); return GetRenderTarget().GenerateMipMaps( renderContext ).GetResult(); } -long Tr2RenderTarget::Resolve( Tr2RenderTarget* destination ) +int32_t Tr2RenderTarget::Resolve( Tr2RenderTarget* destination ) { CCP_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); diff --git a/trinity/Tr2RenderTarget.h b/trinity/Tr2RenderTarget.h index 1a9280fbf..90967dfce 100644 --- a/trinity/Tr2RenderTarget.h +++ b/trinity/Tr2RenderTarget.h @@ -86,8 +86,8 @@ BLUE_CLASS( Tr2RenderTarget ) : Tr2RenderContextEnum::PixelFormat GetFormat() const; Tr2RenderContextEnum::TextureType GetType() const; - long GenerateMipMaps(); - long Resolve( Tr2RenderTarget * destination ); + int32_t GenerateMipMaps(); + int32_t Resolve( Tr2RenderTarget * destination ); Tr2TextureAL& GetRenderTarget(); const Tr2TextureAL& GetRenderTarget() const; From 12175d136eaaec22c3fe999f1cf4d8d74dc6448d Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Tue, 25 Aug 2026 10:28:07 +0000 Subject: [PATCH 2/8] Switch to using v145 as the default compiler for Windows --- .teamcity/Windows/Project.kt | 6 ++---- CMakePresets.json | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 0d4042fcf..2630305d4 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -38,7 +38,7 @@ object Project : Project({ }) -class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ +class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ id(buildName.toId()) this.name = buildName @@ -48,9 +48,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", - options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) - param("VS_DEV_BAT_SWITCHES", "-arch=x64") + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) param("env.VSDEV_BAT_PATH", "%%ProgramFiles(x86)%%/Microsoft Visual Studio/2017/BuildTools/Common7/Tools/vsdevcmd.bat") param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") diff --git a/CMakePresets.json b/CMakePresets.json index e9bdc07fd..e69aa287c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -44,7 +44,7 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { - "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" }, "hidden": true }, @@ -71,8 +71,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", - "VCPKG_TARGET_TRIPLET": "x64-windows-internal", - "VCPKG_HOST_TRIPLET": "x64-windows-internal" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" } }, { @@ -80,8 +80,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "VCPKG_TARGET_TRIPLET": "x64-windows-release", - "VCPKG_HOST_TRIPLET": "x64-windows-release" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", + "VCPKG_HOST_TRIPLET": "x64-windows-145-release" } }, { @@ -89,8 +89,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "VCPKG_TARGET_TRIPLET": "x64-windows-debug", - "VCPKG_HOST_TRIPLET": "x64-windows-debug" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" } }, { @@ -98,8 +98,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", - "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", - "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", + "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" } }, { From ee58e03ff5cefb8ea44eacdb602e487bf6091e03 Mon Sep 17 00:00:00 2001 From: filipppavlov Date: Fri, 11 Sep 2026 14:17:49 +0000 Subject: [PATCH 3/8] Update blue and pdmprotowrapper versions --- vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 46ac26106..b9e005273 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -47,11 +47,11 @@ }, { "name": "carbon-pdmprotowrapper", - "version>=": "2.0.4" + "version>=": "3.0.0#1" }, { "name": "carbon-blue", - "version>=": "6.0.0" + "version>=": "6.2.0" }, { "name": "carbon-math", From 8f2b9ae6d9da13b1046326a73b550b30619792d7 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Fri, 11 Sep 2026 15:58:36 +0000 Subject: [PATCH 4/8] Remove protobuf pinned version --- vcpkg.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index b9e005273..32555369d 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -183,10 +183,6 @@ } }, "overrides": [ - { - "name": "protobuf", - "version": "3.6.0.1" - }, { "name": "openssl", "version": "1.1.1k#8" From aaf4dc98347665a95e8d9e60c9eb45f62d88db20 Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Fri, 11 Sep 2026 16:18:51 +0000 Subject: [PATCH 5/8] Update carbonengine/vcpkg-registry --- vendor/github.com/carbonengine/vcpkg-registry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/carbonengine/vcpkg-registry b/vendor/github.com/carbonengine/vcpkg-registry index f503eea8c..1d8c95f21 160000 --- a/vendor/github.com/carbonengine/vcpkg-registry +++ b/vendor/github.com/carbonengine/vcpkg-registry @@ -1 +1 @@ -Subproject commit f503eea8c313ba8f61d97a5bb0f37e7ba69f749c +Subproject commit 1d8c95f214ff213ad936f1a328040a7fd130c396 From cc78565480719e26a979c8f283965fcecc6d345e Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 16 Sep 2026 09:28:31 +0000 Subject: [PATCH 6/8] Fix TC build config; allow building external PRs --- .teamcity/Windows/Project.kt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 2630305d4..d1b74a082 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -49,7 +49,6 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) - param("env.VSDEV_BAT_PATH", "%%ProgramFiles(x86)%%/Microsoft Visual Studio/2017/BuildTools/Common7/Tools/vsdevcmd.bat") param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType) @@ -140,7 +139,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, echo ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password echo New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential echo Write-Host "##teamcity[progressMessage 'Storing symbols']" - echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) echo ^& ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags ^| Tee-Object -file symstore.txt echo ${'$'}stored = get-content symstore.txt ^| Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" echo ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value @@ -166,7 +165,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ${'$'}Password = ConvertTo-SecureString -String "%DOMAIN_USER_PASSWORD%" -AsPlainText -Force ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential - + Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", "/compress", @@ -177,16 +176,16 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, "/r", # Recursive "/f", "%env.CMAKE_BUILD_FOLDER%") # source folder & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt - + ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value - + ${'$'}errors = get-content symstore.txt | Select-String "^SYMSTORE: Number of errors = (.*)${'$'}" ${'$'}errors = ${'$'}errors.Matches.Groups[1].Value - + ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value - + Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() } @@ -216,7 +215,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, +:refs/heads/release/*.x -:refs/heads/release/1.x """.trimIndent() - filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY } } commitStatusPublisher { @@ -249,4 +248,4 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, requirements { startsWith("teamcity.agent.jvm.os.name", "Windows Server") } -}) +}) \ No newline at end of file From 8e6a091a590c607de91a4cd35e1a9a8035e40a4e Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 16 Sep 2026 10:28:39 +0000 Subject: [PATCH 7/8] Use new Tracy API in core as the old one is deprecated --- trinity/ContinueOnMainThread.cpp | 2 +- trinity/Controllers/Tr2Controller.cpp | 10 +- trinity/Controllers/Tr2TimelineController.cpp | 10 +- trinity/Curves/TriCurveSet.cpp | 2 +- trinity/Eve/EveComponentRegistry.cpp | 12 +-- trinity/Eve/EveDistanceField.cpp | 2 +- trinity/Eve/EveEffectRoot2.cpp | 2 +- trinity/Eve/EveInstancedMeshManager.cpp | 14 +-- trinity/Eve/EveRootTransform.cpp | 2 +- trinity/Eve/EveSpaceScene.cpp | 94 +++++++++---------- trinity/Eve/EveSpaceSceneRenderDriver.cpp | 2 +- trinity/Eve/Renderable/Stretch/EveStretch.cpp | 2 +- .../Eve/Renderable/Stretch/EveStretch3.cpp | 2 +- .../Attachments/EveSpaceObjectDecal.cpp | 4 +- .../Children/Behaviors/BackAndForth.cpp | 2 +- .../Children/Behaviors/BehaviorGroup.cpp | 10 +- .../Children/Behaviors/CollisionAvoidance.cpp | 2 +- .../Children/Behaviors/DroneAvoidance.cpp | 2 +- .../Behaviors/EveKDdroneManagementTree.cpp | 4 +- .../Children/Behaviors/FollowASpline.cpp | 2 +- .../Children/Behaviors/Formation.cpp | 2 +- .../Children/Behaviors/InclusionVolume.cpp | 2 +- .../Children/Behaviors/Inertia.cpp | 2 +- .../SpaceObject/Children/Behaviors/PlayFX.cpp | 2 +- .../Children/Behaviors/ProcessLifetime.cpp | 2 +- .../Children/Behaviors/SeekTarget.cpp | 2 +- .../Children/Behaviors/SpawnDrones.cpp | 4 +- .../SpaceObject/Children/Behaviors/Wander.cpp | 2 +- .../SpaceObject/Children/EveChildCloud2.cpp | 2 +- .../Children/EveChildContainer.cpp | 2 +- .../Eve/SpaceObject/Children/EveChildMesh.cpp | 2 +- .../Children/EveChildPostProcessVolume.cpp | 4 +- .../Children/EveChildSpherePin.cpp | 2 +- trinity/Eve/SpaceObject/EveSpaceObject2.cpp | 12 +-- trinity/Eve/SpaceObject/EveSwarm.cpp | 2 +- trinity/Eve/SpaceObjectFactory/EveSOF.cpp | 44 ++++----- trinity/Eve/SpaceObjectFactory/EveSOFDNA.cpp | 6 +- trinity/Eve/UI/EveLineSet.cpp | 2 +- trinity/Eve/UI/EveSpherePin.cpp | 4 +- trinity/EveSprite2dBracketRenderer.cpp | 2 +- trinity/Font/Tr2FontManager.cpp | 12 +-- trinity/Font/Tr2FontMeasurer.cpp | 24 ++--- trinity/ITr2PickableScene.cpp | 2 +- trinity/Interior/Tr2IntSkinnedObject.cpp | 2 +- trinity/Interior/Tr2InteriorScene.cpp | 22 ++--- trinity/Particle/Tr2DynamicEmitter.cpp | 2 +- trinity/Particle/Tr2ParticleSystem.cpp | 6 +- trinity/Particle/Tr2StaticEmitter.cpp | 2 +- .../PostProcess/Tr2PostProcessRenderer.cpp | 2 +- trinity/Raytracing/Tr2RaytracingGeometry.cpp | 18 ++-- trinity/Raytracing/Tr2RaytracingManager.cpp | 6 +- trinity/RenderJob/Tr2RenderJobs.cpp | 2 +- trinity/RenderJob/TriStepPythonCB.cpp | 2 +- trinity/RenderJob/TriStepResolve.cpp | 2 +- trinity/RenderJob/TriStepRunComputeShader.cpp | 2 +- trinity/RenderJob/TriStepRunJob.cpp | 2 +- trinity/Resources/Tr2CmfContent.cpp | 2 +- trinity/Resources/Tr2EffectRes.cpp | 2 +- trinity/Resources/Tr2GrannyStateRes.cpp | 4 +- trinity/Resources/Tr2ImageRes.cpp | 2 +- trinity/Resources/Tr2TextureLodManager.cpp | 2 +- trinity/Resources/TriGeometryRes.cpp | 40 ++++---- trinity/Resources/TriGrannyRes.cpp | 6 +- trinity/Resources/TriTextureRes.cpp | 8 +- trinity/Shader/Tr2Effect.cpp | 38 ++++---- trinity/Sprite2d/Tr2Sprite2dArc.cpp | 2 +- trinity/Sprite2d/Tr2Sprite2dLine.cpp | 2 +- trinity/Sprite2d/Tr2Sprite2dLineTrace.cpp | 2 +- trinity/Sprite2d/Tr2Sprite2dRenderJob.cpp | 2 +- trinity/Sprite2d/Tr2Sprite2dScene.cpp | 56 +++++------ trinity/StdAfx.h | 11 +++ trinity/Tr2AtlasTexture.cpp | 2 +- trinity/Tr2CurveLineSet.cpp | 2 +- trinity/Tr2DirectInstanceData.cpp | 2 +- trinity/Tr2DxtCompressor.cpp | 2 +- trinity/Tr2DynamicRingBuffer.cpp | 2 +- trinity/Tr2HostBitmap.cpp | 2 +- trinity/Tr2ImageIOHelpers.cpp | 8 +- trinity/Tr2LightManager.cpp | 6 +- trinity/Tr2MeshBase.cpp | 2 +- trinity/Tr2PickBuffer.cpp | 2 +- trinity/Tr2QuadRenderer.cpp | 6 +- trinity/Tr2RenderContext.cpp | 42 ++++----- trinity/Tr2RenderTarget.cpp | 10 +- trinity/Tr2RuntimeInstanceData.cpp | 2 +- trinity/Tr2SSSSS.cpp | 4 +- trinity/Tr2ShLightingManager.cpp | 4 +- trinity/Tr2ShadowMap.cpp | 12 +-- trinity/Tr2SkinnedObject.cpp | 16 ++-- trinity/Tr2SkinnedObjectLOD.cpp | 2 +- trinity/Tr2TextureAnimation.cpp | 12 +-- trinity/Tr2TextureAtlas.cpp | 12 +-- trinity/Tr2VariableStore.cpp | 2 +- trinity/Tr2VolumetricsRenderer.cpp | 6 +- trinity/TriDevice.cpp | 8 +- trinity/TriDevice11.cpp | 4 +- trinity/TriDevice12.cpp | 4 +- trinity/TriDeviceMetal.cpp | 2 +- trinity/UI/Tr2MainWindow_Windows.cpp | 2 +- trinity/trinity.cpp | 11 +++ 100 files changed, 392 insertions(+), 370 deletions(-) diff --git a/trinity/ContinueOnMainThread.cpp b/trinity/ContinueOnMainThread.cpp index fc808491c..bdfb82d32 100644 --- a/trinity/ContinueOnMainThread.cpp +++ b/trinity/ContinueOnMainThread.cpp @@ -19,7 +19,7 @@ void ContinueOnMainThread( std::function&& action ) void ExecuteMainThreadActions() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); static std::vector> actionsToProcess; diff --git a/trinity/Controllers/Tr2Controller.cpp b/trinity/Controllers/Tr2Controller.cpp index 63b2de9e8..445937637 100644 --- a/trinity/Controllers/Tr2Controller.cpp +++ b/trinity/Controllers/Tr2Controller.cpp @@ -110,11 +110,11 @@ void Tr2Controller::OnListModified( long event, ssize_t key, ssize_t key2, IRoot void Tr2Controller::Link( IRoot& owner ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); { CCP_STATS_INC( controllerLinkCount ); - CCP_STATS_SCOPED_TIME( controllerLinkTime ); + TRINITY_STATS_SCOPED_TIME( controllerLinkTime ); Unlink(); @@ -162,7 +162,7 @@ void Tr2Controller::Unlink( UnlinkReason reason ) return; } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( reason != UnlinkReason::DELETING ) { Stop(); @@ -245,7 +245,7 @@ void Tr2Controller::Update( float normalizedUpdateFrequency ) { CCP_STATS_INC( controllerUpdateCount ); - CCP_STATS_SCOPED_TIME( controllerUpdateTime ); + TRINITY_STATS_SCOPED_TIME( controllerUpdateTime ); auto dirtyVariables = m_dirtyVariables; m_dirtyVariables = 0; @@ -256,7 +256,7 @@ void Tr2Controller::Update( float normalizedUpdateFrequency ) } if( !m_updateables.empty() ) { - CCP_STATS_SCOPED_TIME( controllerUpdateablesTime ); + TRINITY_STATS_SCOPED_TIME( controllerUpdateablesTime ); auto simTime = BeOS->GetCurrentFrameTime(); diff --git a/trinity/Controllers/Tr2TimelineController.cpp b/trinity/Controllers/Tr2TimelineController.cpp index 884150b1b..838f3006b 100644 --- a/trinity/Controllers/Tr2TimelineController.cpp +++ b/trinity/Controllers/Tr2TimelineController.cpp @@ -53,11 +53,11 @@ Tr2TimelineController::~Tr2TimelineController() void Tr2TimelineController::Link( IRoot& owner ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); { CCP_STATS_INC( controllerLinkCount ); - CCP_STATS_SCOPED_TIME( controllerLinkTime ); + TRINITY_STATS_SCOPED_TIME( controllerLinkTime ); Unlink(); @@ -96,7 +96,7 @@ void Tr2TimelineController::Unlink( UnlinkReason reason ) return; } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( reason != UnlinkReason::DELETING ) { @@ -182,7 +182,7 @@ void Tr2TimelineController::Update( float normalizedUpdateFrequency ) { CCP_STATS_INC( controllerUpdateCount ); - CCP_STATS_SCOPED_TIME( controllerUpdateTime ); + TRINITY_STATS_SCOPED_TIME( controllerUpdateTime ); auto simTime = BeOS->GetCurrentFrameTime(); auto dt = TimeAsFloat( simTime - m_lastUpdateTime ) * m_timeScale; @@ -222,7 +222,7 @@ void Tr2TimelineController::Update( float normalizedUpdateFrequency ) if( !m_updateables.empty() ) { - CCP_STATS_SCOPED_TIME( controllerUpdateablesTime ); + TRINITY_STATS_SCOPED_TIME( controllerUpdateablesTime ); auto realTime = BeOS->GetActualTime(); diff --git a/trinity/Curves/TriCurveSet.cpp b/trinity/Curves/TriCurveSet.cpp index fb45aedac..2bf87b35f 100644 --- a/trinity/Curves/TriCurveSet.cpp +++ b/trinity/Curves/TriCurveSet.cpp @@ -77,7 +77,7 @@ void TriCurveSet::OnSimClockRebase( Be::Time oldTime, Be::Time newTime ) void TriCurveSet::Update( double time ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_driver != nullptr ) { diff --git a/trinity/Eve/EveComponentRegistry.cpp b/trinity/Eve/EveComponentRegistry.cpp index 541e3841e..58a9eb89e 100644 --- a/trinity/Eve/EveComponentRegistry.cpp +++ b/trinity/Eve/EveComponentRegistry.cpp @@ -16,7 +16,7 @@ EveComponentRegistry::~EveComponentRegistry() void EveComponentRegistry::Clear() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::unique_lock lock( m_componentCollectionLoopGuard ); for( auto& it : m_componentCollections ) @@ -39,7 +39,7 @@ void EveComponentRegistry::Clear() void EveComponentRegistry::ReRegister( EveEntity* entity ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); entity->UnRegister( this ); entity->Register( this ); @@ -86,7 +86,7 @@ void EveComponentRegistry::UnRegister( EveEntity* entity ) // UnRegisters all components for a specific entity void EveComponentRegistry::UnRegisterAllComponents( EveEntity* entity ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::unique_lock lock( m_componentCollectionLoopGuard ); @@ -98,7 +98,7 @@ void EveComponentRegistry::UnRegisterAllComponents( EveEntity* entity ) IEveComponentCollection* EveComponentRegistry::GetComponentCollection( const char* componentName ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( auto& pair : m_componentCollections ) { @@ -113,7 +113,7 @@ IEveComponentCollection* EveComponentRegistry::GetComponentCollection( const cha void EveComponentRegistry::AddToCollection( IEveComponentCollection* collection, EveEntity* entity ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto collectionBit = collection->GetBit(); if( !entity->GetComponentIndex( collectionBit ).has_value() ) @@ -128,7 +128,7 @@ void EveComponentRegistry::AddToCollection( IEveComponentCollection* collection, void EveComponentRegistry::RemoveFromCollection( IEveComponentCollection* collection, EveEntity* entity ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto collectionBit = collection->GetBit(); auto entityIndex = entity->GetComponentIndex( collectionBit ); diff --git a/trinity/Eve/EveDistanceField.cpp b/trinity/Eve/EveDistanceField.cpp index 5ac198926..c53fb326f 100644 --- a/trinity/Eve/EveDistanceField.cpp +++ b/trinity/Eve/EveDistanceField.cpp @@ -107,7 +107,7 @@ float EveDistanceField::CalculateFieldCoverageAndDistance( Be::Time t, const Vec void EveDistanceField::Update( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Vector3 posRef( 0, 0, 0 ); if( m_cameraView ) diff --git a/trinity/Eve/EveEffectRoot2.cpp b/trinity/Eve/EveEffectRoot2.cpp index 02b00254c..21f648412 100644 --- a/trinity/Eve/EveEffectRoot2.cpp +++ b/trinity/Eve/EveEffectRoot2.cpp @@ -195,7 +195,7 @@ void EveEffectRoot2::OnListModified( long event, ssize_t key, ssize_t key2, IRoo void EveEffectRoot2::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); UpdateWorldTransform( updateContext.GetTime() ); diff --git a/trinity/Eve/EveInstancedMeshManager.cpp b/trinity/Eve/EveInstancedMeshManager.cpp index 94ac071b6..264357f2f 100644 --- a/trinity/Eve/EveInstancedMeshManager.cpp +++ b/trinity/Eve/EveInstancedMeshManager.cpp @@ -44,7 +44,7 @@ ITriRenderBatchAccumulator* FindBatchAccumulator( const T& batches, TriBatchType void EveInstancedMeshManager::CollectMeshes( EveComponentRegistry& registry ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); auto renderedFrame = renderContext.GetRenderedFrameNumber(); @@ -479,7 +479,7 @@ uint32_t EveInstancedMeshManager::InstanceBuffer::GetSize() const void EveInstancedMeshManager::PerformFrustumCulling( const TriFrustum& cameraFrustum, float invLodFactor, InstanceFlags filter ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Tr2ParallelDo( begin( m_sphereGroups ), @@ -524,7 +524,7 @@ void EveInstancedMeshManager::PerformFrustumCulling( const TriFrustum& cameraFru void EveInstancedMeshManager::PerformFrustumCulling( const TriFrustum& cameraFrustum, const TriFrustum& pickingFrustum, float invLodFactor, InstanceFlags filter ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Tr2ParallelDo( begin( m_sphereGroups ), @@ -569,7 +569,7 @@ void EveInstancedMeshManager::PerformFrustumCulling( const TriFrustum& cameraFru void EveInstancedMeshManager::PerformFrustumCulling( const TriFrustum& cameraFrustum, const IEveShadowFrustum& shadowFrustum, float invLodFactor, InstanceFlags filter ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); tbb::parallel_for_each( begin( m_sphereGroups ), @@ -740,7 +740,7 @@ std::pair EveInstancedMeshManager::GetPickedObject( uint32_t void EveInstancedMeshManager::BinVisibleInstances( const std::initializer_list>& batches ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); tbb::parallel_for_each( begin( m_meshInstances ), @@ -763,7 +763,7 @@ void EveInstancedMeshManager::BinVisibleInstances( const std::initializer_list>& batches ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector>& traceback = readback.m_instancedTraceback; @@ -851,7 +851,7 @@ void EveInstancedMeshManager::GetPickingBatches( EvePendingPickingReadback& read size_t EveInstancedMeshManager::GetBatches( const std::initializer_list>& batches ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); BinVisibleInstances( batches ); diff --git a/trinity/Eve/EveRootTransform.cpp b/trinity/Eve/EveRootTransform.cpp index 1f276d3c5..41e8a0386 100644 --- a/trinity/Eve/EveRootTransform.cpp +++ b/trinity/Eve/EveRootTransform.cpp @@ -14,7 +14,7 @@ EveRootTransform::EveRootTransform( IRoot* lockobj ) : void EveRootTransform::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Quaternion rotation; Vector3 translation; diff --git a/trinity/Eve/EveSpaceScene.cpp b/trinity/Eve/EveSpaceScene.cpp index 8e109eb1a..5916f6ee8 100644 --- a/trinity/Eve/EveSpaceScene.cpp +++ b/trinity/Eve/EveSpaceScene.cpp @@ -433,7 +433,7 @@ bool EveSpaceScene::OnPrepareResources() void EveSpaceScene::Update( Be::Time realTime, Be::Time simTime ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); { USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -484,7 +484,7 @@ void EveSpaceScene::Update( Be::Time realTime, Be::Time simTime ) m_updateContext.m_raytracingEnabled = m_shadowQuality == ShadowQuality::SHADOW_RAYTRACED && m_enableShadows; { - CCP_STATS_ZONE( "UpdateBackgroundObjects" ); + TRINITY_STATS_ZONE( "UpdateBackgroundObjects" ); for( auto it = m_backgroundObjects.begin(); it != m_backgroundObjects.end(); ++it ) { @@ -543,7 +543,7 @@ void EveSpaceScene::Update( Be::Time realTime, Be::Time simTime ) } { - CCP_STATS_ZONE( "UpdateSyncronous" ); + TRINITY_STATS_ZONE( "UpdateSyncronous" ); for( IEveSpaceObject2Vector::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it ) { @@ -556,7 +556,7 @@ void EveSpaceScene::Update( Be::Time realTime, Be::Time simTime ) } } { - CCP_STATS_ZONE( "UpdateAsyncronous" ); + TRINITY_STATS_ZONE( "UpdateAsyncronous" ); ScopedBlockTrap blockTrap; Tr2ParallelTaskGroup taskGroup = {}; @@ -604,7 +604,7 @@ void EveSpaceScene::Update( Be::Time realTime, Be::Time simTime ) EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderReason renderReason, Tr2ShadowMap& shadowMap, const TriFrustum& viewFrustum, const Tr2TextureAL& depthMap, Tr2GpuResourcePool& gpuResourcePool, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_componentRegistry ) { @@ -676,7 +676,7 @@ EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderRea } { - CCP_STATS_ZONE( "GetBatches" ); + TRINITY_STATS_ZONE( "GetBatches" ); unsigned int shadowMapSize = shadowMap.GetShadowMapSize(); auto shadowCasters = m_componentRegistry->GetComponents(); for( auto& vector : shadowCasterInfo ) @@ -685,7 +685,7 @@ EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderRea } { - CCP_STATS_ZONE( "Find shadow casters" ); + TRINITY_STATS_ZONE( "Find shadow casters" ); Tr2ParallelDo( begin( indices ), end( indices ), [&]( size_t frustumIndex ) { auto cameraFrustum = cameraFrustums[frustumIndex]; auto casters = shadowCasterInfo[frustumIndex]; @@ -706,7 +706,7 @@ EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderRea } ); } { - CCP_STATS_ZONE( "Per object data" ); + TRINITY_STATS_ZONE( "Per object data" ); // This is not thread safe, hence no threading... for( unsigned int frustumIndex = 0; frustumIndex < SHADOW_FRUSTUM_COUNT; ++frustumIndex ) @@ -720,7 +720,7 @@ EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderRea } { - CCP_STATS_ZONE( "get batches" ); + TRINITY_STATS_ZONE( "get batches" ); Tr2ParallelDo( begin( indices ), end( indices ), [&]( size_t frustumIndex ) { for( const auto& info : shadowCasterInfo[frustumIndex] ) { @@ -770,7 +770,7 @@ EveSpaceScene::ShadowResources EveSpaceScene::SetupCascadedShadows( Tr2RenderRea //***** Do the actual shadow rendering to the atlas (cascaded shadow depth map) { - CCP_STATS_ZONE( "ShadowRendering" ); + TRINITY_STATS_ZONE( "ShadowRendering" ); renderContext.m_esm.SetInvertedDepthTest( false ); ON_BLOCK_EXIT( [&] { renderContext.m_esm.SetInvertedDepthTest( true ); } ); @@ -834,7 +834,7 @@ void EveSpaceScene::ApplyPerFrameData( Tr2RenderContext& renderContext ) // -------------------------------------------------------------------------------------- void EveSpaceScene::PrepareTransparentBatch( Tr2RenderableSortList& objectsWithTransparencies, BatchMap& batches, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Sort objects front to back std::stable_sort( objectsWithTransparencies.begin(), objectsWithTransparencies.end() ); @@ -850,7 +850,7 @@ void EveSpaceScene::PrepareTransparentBatch( Tr2RenderableSortList& objectsWithT void GetBatchesFromRenderables( ITr2Renderable** const objectRenderables, const unsigned renderableCount, Tr2RenderableSortList* const objectsWithTransparencies, EveSpaceScene::BatchMap& batches, const TriBatchType* batchTypes, const unsigned batchTypeCount, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( unsigned i = 0; i != renderableCount; ++i ) { @@ -883,13 +883,13 @@ void GetBatchesFromRenderables( const unsigned batchTypeCount, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector perObjectData; perObjectData.reserve( renderableCount ); { - CCP_STATS_ZONE( "PerObjectData" ); + TRINITY_STATS_ZONE( "PerObjectData" ); for( unsigned i = 0; i != renderableCount; ++i ) { @@ -899,7 +899,7 @@ void GetBatchesFromRenderables( } } { - CCP_STATS_ZONE( "GetBatches" ); + TRINITY_STATS_ZONE( "GetBatches" ); Tr2ParallelFor( unsigned( 0 ), renderableCount, [&]( unsigned i ) { ITr2Renderable* r = objectRenderables[i]; @@ -910,7 +910,7 @@ void GetBatchesFromRenderables( } ); } { - CCP_STATS_ZONE( "Combine" ); + TRINITY_STATS_ZONE( "Combine" ); for( unsigned type = 0; type != batchTypeCount; ++type ) { @@ -923,7 +923,7 @@ void GetBatchesFromRenderables( } if( objectsWithTransparencies ) { - CCP_STATS_ZONE( "Transparencies" ); + TRINITY_STATS_ZONE( "Transparencies" ); objectsWithTransparencies->reserve( renderableCount ); @@ -983,7 +983,7 @@ void EveSpaceScene::GetAllBatchesFromRenderables( std::vector& // -------------------------------------------------------------------------------------- void EveSpaceScene::GetOpaqueBatchesFromRenderables( std::vector& objectRenderables, BatchMap& batches, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( objectRenderables.empty() || !Tr2Renderer::GetPoolAllocator() ) { @@ -1007,7 +1007,7 @@ void EveSpaceScene::GetOpaqueBatchesFromRenderables( std::vector& objectRenderables, BatchMap& batches, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( objectRenderables.empty() || !Tr2Renderer::GetPoolAllocator() ) { @@ -1032,7 +1032,7 @@ void EveSpaceScene::GetDepthBatchesFromRenderables( std::vector // -------------------------------------------------------------------------------------- void EveSpaceScene::GetTransparentBatchesFromRenderables( std::vector& objectRenderables, Tr2RenderableSortList& objectsWithTransparencies, bool includeDistortions, BatchMap& batches, Tr2RenderReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( objectRenderables.empty() || !Tr2Renderer::GetPoolAllocator() ) { @@ -1120,7 +1120,7 @@ void EveSpaceScene::RenderBatch( ITriRenderBatchAccumulator* batch, // -------------------------------------------------------------------------------------- void EveSpaceScene::RenderOpaqueBatches( BatchMap& batches, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto& visualizerEffect = m_visualizerEffects[m_visualizeMethod]; @@ -1152,7 +1152,7 @@ void EveSpaceScene::RenderOpaqueBatches( BatchMap& batches, Tr2RenderContext& re // -------------------------------------------------------------------------------------- void EveSpaceScene::RenderTransparentBatches( BatchMap& batches, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto& visualizerEffect = m_visualizerEffects[m_visualizeMethod]; @@ -1176,7 +1176,7 @@ void EveSpaceScene::RenderTransparentBatches( BatchMap& batches, Tr2RenderContex } void EveSpaceScene::RenderTransparentBatches2( BatchMap& batches, Tr2RenderContext& renderContext, bool pass ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto& visualizerEffect = m_visualizerEffects[m_visualizeMethod]; @@ -1220,7 +1220,7 @@ void EveSpaceScene::RenderTransparentBatches2( BatchMap& batches, Tr2RenderConte // -------------------------------------------------------------------------------------- bool EveSpaceScene::RenderDistortionBatches( BatchMap& batches, const Tr2TextureAL& distortionMap, const Tr2TextureAL& depthMap, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !batches[TRIBATCHTYPE_DISTORTION]->GetBatchCount() ) { @@ -1294,7 +1294,7 @@ void EveSpaceScene::Jitter( Tr2RenderContext& renderContext ) // -------------------------------------------------------------------------------------- void EveSpaceScene::BeginRender( bool enableDistortion, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display ) { @@ -1395,7 +1395,7 @@ void EveSpaceScene::BeginRender( bool enableDistortion, Tr2RenderContext& render if( auto lightManager = Tr2LightManager::GetInstance() ) { - CCP_STATS_SCOPED_TIME( gatherDynamicLights ); + TRINITY_STATS_SCOPED_TIME( gatherDynamicLights ); lightManager->SetShadowQuality( m_shadowQuality, renderContext.GetPrimaryRenderContextPointer()->GetRecordingFrameNumber() ); lightManager->Clear( renderContext ); @@ -1432,7 +1432,7 @@ void EveSpaceScene::BeginRender( bool enableDistortion, Tr2RenderContext& render // -------------------------------------------------------------------------------------- void EveSpaceScene::GatherBatches( bool includeDistortions, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector allObjects; @@ -1441,7 +1441,7 @@ void EveSpaceScene::GatherBatches( bool includeDistortions, Tr2RenderContext& re const Matrix& identity = IdentityMatrix(); { - CCP_STATS_ZONE( "UpdateVisibility" ); + TRINITY_STATS_ZONE( "UpdateVisibility" ); Tr2ParallelDo( m_objects.begin(), m_objects.end(), [&]( IEveSpaceObject2* obj ) { obj->UpdateVisibility( m_updateContext, identity ); } ); @@ -1536,7 +1536,7 @@ void EveSpaceScene::PrepareRaytracedShadows( Tr2RenderContext& renderContext ) return; } - CCP_STATS_SCOPED_TIME( raytracedShadowsTime ); + TRINITY_STATS_SCOPED_TIME( raytracedShadowsTime ); m_rtManager->GetGeometry().BeginSceneUpdate(); ProcessOutdatedRTAnimations( renderContext ); @@ -1573,7 +1573,7 @@ void EveSpaceScene::UpdateImpostors( Tr2RenderContext& renderContext ) return; } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); GPU_REGION( renderContext, "Impostors Update" ); CTriViewport fakeViewport; @@ -1685,7 +1685,7 @@ void EveSpaceScene::UpdateImpostors( Tr2RenderContext& renderContext ) void EveSpaceScene::UpdateShLighting( const std::vector& allObjects ) { - CCP_STATS_SCOPED_TIME( shLightingUpdateTime ); + TRINITY_STATS_SCOPED_TIME( shLightingUpdateTime ); if( m_shLightingManager ) { @@ -1714,7 +1714,7 @@ void EveSpaceScene::UpdateQuadRenderer( const std::vector& allObjects, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto& quadRenderer = *Tr2QuadRenderer::Instance(); @@ -1734,7 +1734,7 @@ void EveSpaceScene::UpdateQuadRenderer( PIEveSpaceObject2Vector& objects, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto& quadRenderer = *Tr2QuadRenderer::Instance(); @@ -1765,7 +1765,7 @@ void EveSpaceScene::RenderReflectionPass( Tr2GpuResourcePool& gpuResourcePool, T return; } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // set the current reflection GPU_REGION( renderContext, "Reflection" ); @@ -2001,7 +2001,7 @@ void EveSpaceScene::RenderReflectionPass( Tr2GpuResourcePool& gpuResourcePool, T // -------------------------------------------------------------------------------------- bool EveSpaceScene::RenderBackgroundPass( const Tr2TextureAL& depthMap, const Tr2TextureAL& distortionMap, const Tr2TextureAL& velocityMap, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); bool hasBackgroundDistortionBatches = false; @@ -2078,7 +2078,7 @@ bool EveSpaceScene::RenderBackgroundPass( const Tr2TextureAL& depthMap, const Tr // -------------------------------------------------------------------------------------- bool EveSpaceScene::RenderBackgroundPassObjects( const Tr2TextureAL& depthMap, const Tr2TextureAL& distortionMap, Tr2RenderContext& renderContext, BackgroundRenderingReason reason ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector visible; Tr2RenderableSortList transparentObjects; @@ -2197,7 +2197,7 @@ bool EveSpaceScene::RenderBackgroundPassObjects( const Tr2TextureAL& depthMap, c // -------------------------------------------------------------------------------------- void EveSpaceScene::RenderDepthPass( const Tr2TextureAL& depthMap, const Tr2TextureAL& normalMap, const Tr2TextureAL& customStencil, Tr2RenderContext& renderContext, const BlueSharedString& techniqueName ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display ) { @@ -2354,7 +2354,7 @@ void EveSpaceScene::RenderDepthPass( const Tr2TextureAL& depthMap, const Tr2Text void EveSpaceScene::RenderVolumetricShadowMap( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto shadowCasters = m_componentRegistry->GetComponents(); @@ -2372,7 +2372,7 @@ void EveSpaceScene::RenderVolumetricShadowMap( Tr2RenderContext& renderContext ) void EveSpaceScene::RenderIntoCloudShadowMap( Tr2RenderContext& renderContext, const ITr2VolumetricRenderable::ShadowInfo* cloudShadowInformation, std::vector shadowCasters ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Get distance from camera to zFar auto direction = Tr2Renderer::GetViewPosition() - cloudShadowInformation->aabbMax; @@ -2386,7 +2386,7 @@ void EveSpaceScene::RenderIntoCloudShadowMap( Tr2RenderContext& renderContext, c frustum.ExtractFrustum( &viewProj ); { - CCP_STATS_ZONE( "get shadowbatches for volumetrics" ); + TRINITY_STATS_ZONE( "get shadowbatches for volumetrics" ); auto shadowFrustum = TriShadowOrthoFrustum( cloudShadowInformation->shadowFrustum, cloudShadowInformation->shadowMapSize, m_sunData.DirWorld ); float sizeInShadow = 0.0f; for( auto& caster : shadowCasters ) @@ -2475,7 +2475,7 @@ std::pair EveSpaceScen bool EveSpaceScene::PrepareShadowMapForLights( Tr2RenderContext& renderContext, const Tr2TextureAL& shadowMap ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Using depth stencil as shadow map renderContext.m_esm.PushRenderTarget( Tr2TextureAL() ); //empty texture @@ -2499,7 +2499,7 @@ void EveSpaceScene::RenderShadowMapForSpotLight( const Matrix& projection, const Tr2TextureAL& shadowMap ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); renderContext.m_esm.PushViewport(); renderContext.m_esm.UpdateRenderTargetViewport( shadowMap.GetWidth(), shadowMap.GetHeight() ); @@ -2513,7 +2513,7 @@ void EveSpaceScene::RenderShadowMapForSpotLight( TriFrustum shadowFrustum; shadowFrustum.DeriveFrustum( &view, &lightPosition, &projection, renderContext.m_esm.GetViewport() ); { - CCP_STATS_ZONE( "get shadowbatches for light" ); + TRINITY_STATS_ZONE( "get shadowbatches for light" ); float sizeInShadow = 0.0f; for( auto& caster : shadowCasters ) { @@ -2559,7 +2559,7 @@ void EveSpaceScene::RenderShadowMapForSpotLight( void EveSpaceScene::RenderShadowMapForLight( Tr2RenderContext& renderContext, const std::vector& shadowCasters, const Tr2LightManager::PerLightData& lightData, const Tr2TextureAL& shadowMap ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( lightData.innerAngle <= 0. ) { @@ -2692,7 +2692,7 @@ bool EveSpaceScene::RenderMainPass( Tr2GpuResourcePool& gpuResourcePool, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); bool hasForegroundDistortionBatches = false; @@ -2791,7 +2791,7 @@ void EveSpaceScene::RunLensflareOcclusionQueries( const Tr2TextureAL& depthMap, // -------------------------------------------------------------------------------------- void EveSpaceScene::EndRender( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display ) { @@ -2970,7 +2970,7 @@ void EveSpaceScene::ClearBatches( BatchMap& batches ) // -------------------------------------------------------------------------------------- void EveSpaceScene::FinalizeBatches( BatchMap& batches ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( auto it = batches.begin(); it != batches.end(); ++it ) { diff --git a/trinity/Eve/EveSpaceSceneRenderDriver.cpp b/trinity/Eve/EveSpaceSceneRenderDriver.cpp index c72520ae5..640a6a81a 100644 --- a/trinity/Eve/EveSpaceSceneRenderDriver.cpp +++ b/trinity/Eve/EveSpaceSceneRenderDriver.cpp @@ -539,7 +539,7 @@ void EveSpaceSceneRenderDriver::Execute( const Span& destina if( auto lightManager = Tr2LightManager::GetInstance() ) { GPU_REGION( renderContext, "Lighting" ); - CCP_STATS_SCOPED_TIME( updateDynamicLightLists ); + TRINITY_STATS_SCOPED_TIME( updateDynamicLightLists ); renderContext.SetReadOnlyDepth( true ); lightManager->UpdateLists( depthBuffer, renderContext ); renderContext.SetReadOnlyDepth( false ); diff --git a/trinity/Eve/Renderable/Stretch/EveStretch.cpp b/trinity/Eve/Renderable/Stretch/EveStretch.cpp index 1a49299f7..cdf7c8cd7 100644 --- a/trinity/Eve/Renderable/Stretch/EveStretch.cpp +++ b/trinity/Eve/Renderable/Stretch/EveStretch.cpp @@ -52,7 +52,7 @@ bool EveStretch::OnModified( Be::Var* value ) // start the update mess! void EveStretch::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Be::Time time = updateContext.GetTime(); if( !m_update ) diff --git a/trinity/Eve/Renderable/Stretch/EveStretch3.cpp b/trinity/Eve/Renderable/Stretch/EveStretch3.cpp index f518ca15e..f3f9678a7 100644 --- a/trinity/Eve/Renderable/Stretch/EveStretch3.cpp +++ b/trinity/Eve/Renderable/Stretch/EveStretch3.cpp @@ -378,7 +378,7 @@ void EveStretch3::OnListModified( long event, ssize_t key, ssize_t key2, IRoot* void EveStretch3::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_update ) { diff --git a/trinity/Eve/SpaceObject/Attachments/EveSpaceObjectDecal.cpp b/trinity/Eve/SpaceObject/Attachments/EveSpaceObjectDecal.cpp index b3388e9fb..52e288c8d 100644 --- a/trinity/Eve/SpaceObject/Attachments/EveSpaceObjectDecal.cpp +++ b/trinity/Eve/SpaceObject/Attachments/EveSpaceObjectDecal.cpp @@ -591,7 +591,7 @@ void EveSpaceObjectDecal::SetBoneIndex( int idx ) // ------------------------------------------------------------------------------------------------------ void EveSpaceObjectDecal::CreateDecalIndexBuffers( TriGeometryResPtr geomRes, DecalMeshCache& meshCache ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -826,7 +826,7 @@ void EveSpaceObjectDecal::SetMinScreenSize( float minScreenSize ) void EveSpaceObjectDecal::CreateStaticIndexBuffers( TriGeometryResPtr geomRes ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/BackAndForth.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/BackAndForth.cpp index 221674c21..0c2a9292d 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/BackAndForth.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/BackAndForth.cpp @@ -50,7 +50,7 @@ void BackAndForth::InitializeScratch( void* scratchMemory ) std::vector BackAndForth::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector todo; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/BehaviorGroup.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/BehaviorGroup.cpp index 8571b9a6f..91bf20d69 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/BehaviorGroup.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/BehaviorGroup.cpp @@ -520,7 +520,7 @@ void BehaviorGroup::RemoveAgentsByCount( int count ) // -------------------------------------------------------------------------------------- void BehaviorGroup::UpdateAgents( const float dt, EveChildBehaviorSystem& system ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // make sure the update isn't too big when e.g. a player resizes his window (in window mode) float deltaTime = TriClamp( dt, 0.0, 0.1 ); @@ -636,7 +636,7 @@ float BehaviorGroup::GetBlendModifier() const // -------------------------------------------------------------------------------------- void BehaviorGroup::UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& worldTransform ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_currentScreenSize = 0.0f; float worldRadius = 1; @@ -691,7 +691,7 @@ bool BehaviorGroup::IsGroupVisible() const // -------------------------------------------------------------------------------------- void BehaviorGroup::GetShipInfoForBuffer( uint8_t* data, const Matrix& parentWorldLocation ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_lightInfo.clear(); auto agentScale = Vector3( 1.0, 1.0, 1.0 ); Matrix zeroMatrix = ScalingMatrix( Vector3( 0.0, 0.0, 0.0 ) ); @@ -747,7 +747,7 @@ void BehaviorGroup::GetShipInfoForBuffer( uint8_t* data, const Matrix& parentWor // -------------------------------------------------------------------------------------- void BehaviorGroup::GetBoosterInfoForBuffer( uint8_t* data, const Matrix& parentWorldLocation ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_lightInfo.clear(); auto agentScale = Vector3( 1.0, 1.0, 1.0 ); Matrix zeroMatrix = ScalingMatrix( Vector3( 0.0, 0.0, 0.0 ) ); @@ -1042,7 +1042,7 @@ void BehaviorGroup::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer ) void BehaviorGroup::AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_display && IsGroupVisible() ) { diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/CollisionAvoidance.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/CollisionAvoidance.cpp index 25851379a..bb3e3a8c1 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/CollisionAvoidance.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/CollisionAvoidance.cpp @@ -22,7 +22,7 @@ int CollisionAvoidance::GetProcessPriority() std::vector CollisionAvoidance::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector forceVectors; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/DroneAvoidance.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/DroneAvoidance.cpp index e232a5c2a..44f29e794 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/DroneAvoidance.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/DroneAvoidance.cpp @@ -26,7 +26,7 @@ int DroneAvoidance::GetProcessPriority() std::vector DroneAvoidance::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector returnForces; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/EveKDdroneManagementTree.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/EveKDdroneManagementTree.cpp index 20f7636ec..b1c9cc6ce 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/EveKDdroneManagementTree.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/EveKDdroneManagementTree.cpp @@ -17,7 +17,7 @@ EveKDdroneManagementTree::~EveKDdroneManagementTree() void EveKDdroneManagementTree::CreateTree( std::vector& agents, size_t NumberOfBehaviors ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( agents.empty() ) { @@ -379,7 +379,7 @@ const std::vector>>* EveKDdroneManagementTr std::vector& ranges, const float& BehaviorGroupBoundingSphereRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector searchRanges; int behaviorNumber = 0; diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/FollowASpline.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/FollowASpline.cpp index 278b44943..c50a0678d 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/FollowASpline.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/FollowASpline.cpp @@ -200,7 +200,7 @@ void FollowASpline::InitializeScratch( void* scratchMemory ) std::vector FollowASpline::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector forceVectors; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/Formation.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/Formation.cpp index 31fb6d98d..500031bf7 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/Formation.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/Formation.cpp @@ -57,7 +57,7 @@ bool Formation::InFormation() std::vector Formation::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector returnForces; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/InclusionVolume.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/InclusionVolume.cpp index 827dbd108..c5de0d980 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/InclusionVolume.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/InclusionVolume.cpp @@ -25,7 +25,7 @@ int InclusionVolume::GetProcessPriority() std::vector InclusionVolume::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector returnForces; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/Inertia.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/Inertia.cpp index 3ce0901cf..16ebaed37 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/Inertia.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/Inertia.cpp @@ -34,7 +34,7 @@ void Inertia::InitializeScratch( void* scratchMemory ) std::vector Inertia::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto data = static_cast( scratchData ); diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/PlayFX.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/PlayFX.cpp index 841d46e15..381b944e5 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/PlayFX.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/PlayFX.cpp @@ -44,7 +44,7 @@ void PlayFX::InitializeScratch( void* scratchMemory ) std::vector PlayFX::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_behaviorWeight <= 0 || !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/ProcessLifetime.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/ProcessLifetime.cpp index ee7e900d2..69337201d 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/ProcessLifetime.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/ProcessLifetime.cpp @@ -93,7 +93,7 @@ void ProcessLifetime::InitializeScratch( void* scratchMemory ) std::vector ProcessLifetime::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_shouldReassignTunnelIDs ) { diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/SeekTarget.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/SeekTarget.cpp index ddf357daa..6be92f367 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/SeekTarget.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/SeekTarget.cpp @@ -52,7 +52,7 @@ void SeekTarget::InitializeScratch( void* scratchMemory ) std::vector SeekTarget::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_arrivalPoints.resize( agents.size() ); std::vector m_returnForces; diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/SpawnDrones.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/SpawnDrones.cpp index 0c68209ba..0955447d2 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/SpawnDrones.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/SpawnDrones.cpp @@ -25,7 +25,7 @@ SpawnDrones::~SpawnDrones() void SpawnDrones::UpdateGrid( BehaviorGroup& group ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // for behaviors to work we always have to add one decoy drone, delete that one so he doesn't mess up the cube for( unsigned int i = 0; i < group.GetCount(); i++ ) @@ -86,7 +86,7 @@ void SpawnDrones::UpdateGrid( BehaviorGroup& group ) std::vector SpawnDrones::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector noNeedToReturnForces; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/Behaviors/Wander.cpp b/trinity/Eve/SpaceObject/Children/Behaviors/Wander.cpp index 2fb3f1ba7..fe74b7ae6 100644 --- a/trinity/Eve/SpaceObject/Children/Behaviors/Wander.cpp +++ b/trinity/Eve/SpaceObject/Children/Behaviors/Wander.cpp @@ -27,7 +27,7 @@ int Wander::GetProcessPriority() std::vector Wander::CalculateBehavior( std::vector& agents, void* scratchData, const float deltaTime, BehaviorGroup& group, EveChildBehaviorSystem& system, const std::vector>& dronesInSearchRadius ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector forceVectors; if( !m_enabled ) diff --git a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp index 652442526..25fd16fee 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp @@ -773,7 +773,7 @@ void EveChildCloud2::GetVolumetricShadowInfo( ShadowInfo& shadowInfo, Vector3 su bool EveChildCloud2::PrepareCloudShadowMap( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_receiveShadows ) { diff --git a/trinity/Eve/SpaceObject/Children/EveChildContainer.cpp b/trinity/Eve/SpaceObject/Children/EveChildContainer.cpp index 7a0ed4e62..7bfaf3446 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildContainer.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildContainer.cpp @@ -522,7 +522,7 @@ void EveChildContainer::UpdateAsyncronous( const EveUpdateContext& updateContext if( m_isPlacementRoot && updateContext.GetTaskGroup() ) { updateContext.GetTaskGroup()->run( [this, &updateContext, params] { - CCP_STATS_ZONE( "Placement Child UpdateAsyncronous" ); + TRINITY_STATS_ZONE( "Placement Child UpdateAsyncronous" ); this->DoUpdateAsyncronous( updateContext, params ); } ); } diff --git a/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp b/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp index a6b3b3a16..da32c305f 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildMesh.cpp @@ -1737,7 +1737,7 @@ bool EveChildMesh::PrepareMorphBuffers( Tr2RenderContext& renderContext ) m_morphTargetOffsets.AdvanceFrame(); m_morphTargetOffsets.UploadTransforms( Tr2RingBuffer::GetInstance(), reinterpret_cast( morphTargets ), uint32_t( morphTargetCount ) ); - CCP_STATS_ZONE( "Prepare MorphTargetAnimationDataBuffer for merging morph targets" ); + TRINITY_STATS_ZONE( "Prepare MorphTargetAnimationDataBuffer for merging morph targets" ); Tr2RingBuffer::GetInstance().PrepareBuffer( renderContext ); MergeMorphsConstantBuffer* data; diff --git a/trinity/Eve/SpaceObject/Children/EveChildPostProcessVolume.cpp b/trinity/Eve/SpaceObject/Children/EveChildPostProcessVolume.cpp index af7e266ce..3b3a935e6 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildPostProcessVolume.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildPostProcessVolume.cpp @@ -23,7 +23,7 @@ EveChildPostProcessVolume::~EveChildPostProcessVolume() void EveChildPostProcessVolume::RebuildBoundingSphere() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_boundingSphere.center *= 0.0f; m_boundingSphere.radius *= 0.0f; @@ -82,7 +82,7 @@ bool EveChildPostProcessVolume::GetBoundingSphere( Vector4& sphere, BoundingSphe void EveChildPostProcessVolume::UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); UpdateTransformFromParent( params ); diff --git a/trinity/Eve/SpaceObject/Children/EveChildSpherePin.cpp b/trinity/Eve/SpaceObject/Children/EveChildSpherePin.cpp index 5cc2d6225..b33886e66 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildSpherePin.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildSpherePin.cpp @@ -67,7 +67,7 @@ Tr2PerObjectData* EveChildSpherePin::GetPerObjectData( ITriRenderBatchAccumulato // -------------------------------------------------------------------------------- void EveChildSpherePinPerObjectData::SetPerObjectDataToDevice( Tr2ConstantBufferAL** buffers, unsigned constantTypeMask, Tr2RenderContext& renderContext ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const int constantCount = sizeof( EveChildSpherePinPerObjectData ) - sizeof( Tr2PerObjectData ); FillAndSetConstants( *buffers[VERTEX_SHADER], &m_worldMatrix, constantCount, VERTEX_SHADER, Tr2Renderer::GetPerObjectVSStartRegister(), renderContext ); diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp index 6ba4e3f15..c9374cfe7 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp @@ -1588,7 +1588,7 @@ void EveSpaceObject2::PushChildrenAndDecalRenderables( std::vectorGetGeometryResource() ) { @@ -2018,7 +2018,7 @@ bool EveSpaceObject2::CollectOccluders() bool EveSpaceObject2::AreOccludersReadyForRaycasts() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( size_t i = 0; i < m_damageFilterOccluders.size(); ) { @@ -2045,7 +2045,7 @@ bool EveSpaceObject2::AreOccludersReadyForRaycasts() void EveSpaceObject2::RefreshDamageLocatorMask( const LocatorStructureList* damageLocators ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector enabled; enabled.resize( m_damageLocatorEnabled.size() ); @@ -2119,7 +2119,7 @@ void EveSpaceObject2::RefreshDamageLocatorMask( const LocatorStructureList* dama void EveSpaceObject2::UpdateDamageLocatorFilter() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_damageFilterState == DamageFilterState::Idle ) { @@ -3696,7 +3696,7 @@ Vector3 EveSpaceObject2::GetDamageLocatorDirectionLocal( uint32_t index ) const // -------------------------------------------------------------------------------- Vector3 EveSpaceObject2::GetTransformedDamageLocator( uint32_t index ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto damageLocators = GetLocatorsForSet( DAMAGE_LOCATOR_SET_NAME ); if( !damageLocators || index >= damageLocators->size() ) diff --git a/trinity/Eve/SpaceObject/EveSwarm.cpp b/trinity/Eve/SpaceObject/EveSwarm.cpp index d362aab48..4b874d414 100644 --- a/trinity/Eve/SpaceObject/EveSwarm.cpp +++ b/trinity/Eve/SpaceObject/EveSwarm.cpp @@ -496,7 +496,7 @@ void EveSwarm::UpdateAsyncronous( const EveUpdateContext& context ) void EveSwarm::UpdateSwarm( Be::Time t ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( t == m_timeLast ) { return; diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp index 4e060394c..ad7366c07 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp @@ -177,7 +177,7 @@ IRootPtr EveSOF::BuildFromDNA( const char* dnaString ) { std::string s = "BuildFromDna "; s += std::string( dnaString ); - CCP_STATS_ZONE( s.c_str() ); + TRINITY_STATS_ZONE( s.c_str() ); EveSOFDNAPtr dna = CreateDna( dnaString ); if( dna == nullptr ) @@ -390,7 +390,7 @@ IRootPtr EveSOF::Build( const char* hullName, const char* factionName, const cha // -------------------------------------------------------------------------------- bool EveSOF::ValidateDNA( const char* dnaString ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // create a DNA object EveSOFDNAPtr dna; @@ -466,7 +466,7 @@ EveSpaceObject2Ptr EveSOF::CreateSpaceObject( const EveSOFDNAPtr dna ) const // -------------------------------------------------------------------------------- void EveSOF::SetupConsts( EveSpaceObject2Ptr ship, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // dna dirt ship->SetDnaString( dna->GetDnaString() ); @@ -478,7 +478,7 @@ void EveSOF::SetupConsts( EveSpaceObject2Ptr ship, const EveSOFDNAPtr dna ) cons // -------------------------------------------------------------------------------- void EveSOF::SetupMesh( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // bounding sphere comes from data, is faster obj->SetBoundingSphereInformation( dna->GetHullBoundingSphere() ); @@ -558,7 +558,7 @@ void EveSOF::GenerateDepthFromAreaVector( Tr2MeshBase* mesh, const Tr2MeshAreaVe // -------------------------------------------------------------------------------- size_t EveSOF::FillMeshAreaVector( Tr2MeshAreaVector* meshAreaVector, TriBatchType areaType, const EveSOFDNAPtr dna, size_t hullIdx, size_t meshIndexOffset ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const std::vector* hullAreas = dna->GetHullMeshAreas( areaType, hullIdx ); for( auto area = hullAreas->begin(); area != hullAreas->end(); ++area ) @@ -610,7 +610,7 @@ size_t EveSOF::FillMeshAreaVector( Tr2MeshAreaVector* meshAreaVector, TriBatchTy // shader textures from the hull data for( auto it = area->textures.begin(); it != area->textures.end(); ++it ) { - CCP_STATS_ZONE( "texture" ); + TRINITY_STATS_ZONE( "texture" ); // res path how it is from hull data std::string highResPath = it->second.resFilePath; @@ -716,7 +716,7 @@ bool EveSOF::GenerateLodResourcePaths( std::string& mediumResPath, std::string& // -------------------------------------------------------------------------------- void EveSOF::SetupSpriteSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -806,7 +806,7 @@ void EveSOF::SetupSpriteSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSO // -------------------------------------------------------------------------------- void EveSOF::SetupSpotlightSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -961,7 +961,7 @@ void EveSOF::SetupSpotlightSets( IEveSpaceObjectAttachmentOwnerPtr obj, const Ev // -------------------------------------------------------------------------------- void EveSOF::SetupPlaneSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -1124,7 +1124,7 @@ void EveSOF::SetupPlaneSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOF // -------------------------------------------------------------------------------- void EveSOF::SetupSpriteLineSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -1243,7 +1243,7 @@ void EveSOF::SetupSpriteLineSets( IEveSpaceObjectAttachmentOwnerPtr obj, const E // -------------------------------------------------------------------------------- void EveSOF::SetupHazeSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -1357,7 +1357,7 @@ void EveSOF::SetupHazeSets( IEveSpaceObjectAttachmentOwnerPtr obj, const EveSOFD // -------------------------------------------------------------------------------- void EveSOF::SetupBanners( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna, const std::vector& offsets ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -1513,7 +1513,7 @@ void EveSOF::SetupBanners( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna, const // void EveSOF::SetupBannerSets( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna, const std::vector& offsets ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -1671,7 +1671,7 @@ void EveSOF::SetupBannerSets( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna, co // -------------------------------------------------------------------------------- void EveSOF::SetupModelCurves( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Model rotation curve const char* rotationCurvePath = dna->GetModelRotationCurvePath(); @@ -1756,7 +1756,7 @@ void RecursiveBindParticleEmitters( EveSpaceObjectChild* child, TriCurveSet* cur // -------------------------------------------------------------------------------- void EveSOF::SetupChildrenAndAnimations( EveSpaceObject2Ptr obj, IEveEffectChildrenOwnerPtr childOwner, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto postCopy = m_editorMode ? &PostCopyMetadata : nullptr; @@ -1817,7 +1817,7 @@ void EveSOF::SetupChildrenAndAnimations( EveSpaceObject2Ptr obj, IEveEffectChild EveSpaceObjectChildPtr transformedChild; if( ++index < offsets.size() ) { - CCP_STATS_ZONE( "Child Copy" ); + TRINITY_STATS_ZONE( "Child Copy" ); transformedChild = BlueCastPtr( BlueCopy( effectChild, nullptr, nullptr, postCopy ) ); } else @@ -1923,7 +1923,7 @@ void EveSOF::SetupChildrenAndAnimations( EveSpaceObject2Ptr obj, IEveEffectChild // -------------------------------------------------------------------------------- void EveSOF::SetupEffectChildren( EveSpaceObject2Ptr newObj, IEveEffectChildrenOwnerPtr childOwner, const EveSOFDNAPtr dna, const std::vector& offsets, uint32_t buildFlags ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Experimental features for PHASE-6 // Note that this will ignore the child id and the animation id thing... don't know what will happen with the rorqual... const std::vector& hullChildSets = dna->GetHullChildSets(); @@ -2653,7 +2653,7 @@ Tr2EffectPtr EveSOF::CreateBoosterEffect( const EveSOFDataMgr::RaceBoosterData* // -------------------------------------------------------------------------------- void EveSOF::SetupBoosters( EveShip2Ptr ship, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // does this hull have boosters at all? if( dna->GetHullBoosterCount() == 0 ) @@ -2788,7 +2788,7 @@ void EveSOF::SetupBoosters( EveShip2Ptr ship, const EveSOFDNAPtr dna ) const // -------------------------------------------------------------------------------- void EveSOF::SetupDecalSets( IEveSpaceObjectDecalOwnerPtr obj, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -2932,7 +2932,7 @@ void EveSOF::SetupDecalSets( IEveSpaceObjectDecalOwnerPtr obj, const EveSOFDNAPt // -------------------------------------------------------------------------------- void EveSOF::SetupLocators( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -2986,7 +2986,7 @@ void EveSOF::SetupLocators( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna ) con // -------------------------------------------------------------------------------- void EveSOF::SetupLocatorSets( EveSpaceObject2Ptr obj, const EveSOFDNAPtr dna, const std::vector& offsets ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // cycle over all hulls in the multi-hull list Vector3 hullOffset( 0.f, 0.f, 0.f ); @@ -3084,7 +3084,7 @@ std::vector EveSOF::BuildHullLocalLocatorSets( const EveSOFDN void EveSOF::SetupLayout( EveSpaceObject2Ptr obj, EveChildContainerPtr layoutContainer, EveChildInstancedMeshesPtr& sharedMeshes, const EveSOFDNAPtr dna, const std::vector& offsets, int& partTag, uint32_t seedOverwrite ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::map> locatorSets; // map out all possible locators that the layouts can utilize diff --git a/trinity/Eve/SpaceObjectFactory/EveSOFDNA.cpp b/trinity/Eve/SpaceObjectFactory/EveSOFDNA.cpp index 5147e78b7..b60a7265f 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOFDNA.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOFDNA.cpp @@ -215,7 +215,7 @@ bool EveSOFDNA::ValidateContent() // -------------------------------------------------------------------------------- void EveSOFDNA::Setup( const char* dnaString, EveSOFDataMgrPtr dataMgr ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); std::vector commandArgs; @@ -338,7 +338,7 @@ void EveSOFDNA::Setup( const char* dnaString, EveSOFDataMgrPtr dataMgr ) // -------------------------------------------------------------------------------- void EveSOFDNA::Setup( const BlueSharedString layoutName, const EveSOFDataMgr::DNADescriptorData& descriptor, EveSOFDNAPtr parent, const EveSOFDataMgrPtr dataMgr ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // remember the pointer to the BIG lib as long as this DNA object lives m_dataMgr = dataMgr; @@ -1253,7 +1253,7 @@ const std::vector* EveSOFDNA::GetHullMeshAreas( TriBat // -------------------------------------------------------------------------------- const Vector4* EveSOFDNA::GetMeshAreaParameter( EveSOFDataArea::AreaType areaType, const BlueSharedString& parameterName, const std::map* hullParameters, unsigned int blockededMaterials ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // do we have a dna mesh command for this? std::vector commandArgs; diff --git a/trinity/Eve/UI/EveLineSet.cpp b/trinity/Eve/UI/EveLineSet.cpp index 122f38f1c..0afc224b3 100644 --- a/trinity/Eve/UI/EveLineSet.cpp +++ b/trinity/Eve/UI/EveLineSet.cpp @@ -97,7 +97,7 @@ bool EveLineSet::OnPrepareResources() // IEveSpaceObject2 void EveLineSet::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Quaternion rotation( 0.0f, 0.0f, 0.0f, 1.0f ); Vector3 translation( 0.0f, 0.0f, 0.0f ); diff --git a/trinity/Eve/UI/EveSpherePin.cpp b/trinity/Eve/UI/EveSpherePin.cpp index e211792d2..d91dd408d 100644 --- a/trinity/Eve/UI/EveSpherePin.cpp +++ b/trinity/Eve/UI/EveSpherePin.cpp @@ -185,7 +185,7 @@ void EveSpherePin::ReleaseCachedData( BlueAsyncRes* p ) // ------------------------------------------------------------------------------------------------------ void EveSpherePin::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_tree ) { @@ -414,7 +414,7 @@ void EveSpherePin::GetPickingBatches( ITriRenderBatchAccumulator* batches, Tr2Pi // -------------------------------------------------------------------------------- void EveSpherePinPerObjectData::SetPerObjectDataToDevice( Tr2ConstantBufferAL** buffers, unsigned constantTypeMask, Tr2RenderContext& renderContext ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // set to VS int vsConstantCount = 4 + 6; diff --git a/trinity/EveSprite2dBracketRenderer.cpp b/trinity/EveSprite2dBracketRenderer.cpp index f05784a94..8750ed7a9 100644 --- a/trinity/EveSprite2dBracketRenderer.cpp +++ b/trinity/EveSprite2dBracketRenderer.cpp @@ -19,7 +19,7 @@ unsigned int EveSprite2dBracketRenderer::GetVertexCount() void EveSprite2dBracketRenderer::GatherSprites( Tr2Sprite2dScene* renderer ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); using namespace Tr2RenderContextEnum; diff --git a/trinity/Font/Tr2FontManager.cpp b/trinity/Font/Tr2FontManager.cpp index b9ed6a08c..7a46ff142 100644 --- a/trinity/Font/Tr2FontManager.cpp +++ b/trinity/Font/Tr2FontManager.cpp @@ -182,7 +182,7 @@ FaceID Tr2FontManager::GetFaceID( const char* font ) ////////////////////////////////////////////////////////////////////////// FT_Face Tr2FontManager::LookupFace( const FaceID& faceID ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); FT_Face face = NULL; @@ -207,7 +207,7 @@ FT_Face Tr2FontManager::LookupFace( const FaceID& faceID ) ////////////////////////////////////////////////////////////////////////// FT_Size_Metrics Tr2FontManager::LookupMetrics( const FaceID& faceID, unsigned int width, unsigned int height ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); FTC_ScalerRec scaler = { (FTC_FaceID)faceID, width, height, 1, 0, 0 }; // 1 indicates to use pixel sizes FT_Size size; @@ -241,7 +241,7 @@ std::pair Tr2FontManager::LookupMetricsFromScript( const FaceID& faceI ////////////////////////////////////////////////////////////////////////// FT_Pos Tr2FontManager::LookupKerningXP( const FaceID& faceID, int leftIndex, int rightIndex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); FT_Face face = NULL; if( m_manager ) @@ -270,7 +270,7 @@ FT_Pos Tr2FontManager::LookupKerningXP( const FaceID& faceID, int leftIndex, int ////////////////////////////////////////////////////////////////////////// int Tr2FontManager::LookupGlyphIndex( const FaceID& faceID, int charCode ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); FT_Face face = LookupFace( faceID ); FT_Error err = FT_Select_Charmap( face, FT_ENCODING_UNICODE ); @@ -300,7 +300,7 @@ int Tr2FontManager::LookupGlyphIndex( const FaceID& faceID, int charCode ) ////////////////////////////////////////////////////////////////////////// Be::Result Tr2FontManager::LookupSBit( const FaceID& faceID, int width, int height, int glyphIndex, Tr2SBitWrapper** result ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Tr2SBitWrapper* img = new OTr2SBitWrapper; @@ -334,7 +334,7 @@ inline FT_Fixed Fix( float f ) //----------------------------------------------------------------------------- FT_Face Tr2FontManager::LoadFromDisk( FTC_FaceID id ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_ftLib ) { diff --git a/trinity/Font/Tr2FontMeasurer.cpp b/trinity/Font/Tr2FontMeasurer.cpp index fba26c74d..433665ee2 100644 --- a/trinity/Font/Tr2FontMeasurer.cpp +++ b/trinity/Font/Tr2FontMeasurer.cpp @@ -126,7 +126,7 @@ DEFINE_CACHED_ALLOCATOR( Tr2FontRenderData, 512, 256 ); ////////////////////////////////////////////////////////////////////////// void Tr2FontMeasurer::Reset() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_cursorX = 0; m_cursorY = 0; @@ -167,7 +167,7 @@ void Tr2FontMeasurer::Reset() unsigned int Tr2FontMeasurer::AddText( const std::wstring& text ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const char* font; @@ -383,7 +383,7 @@ unsigned int Tr2FontMeasurer::AddText( const std::wstring& text ) void Tr2FontMeasurer::CommitText( int shiftX, int shiftY ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Note that reference counts of sbits are not affected - we're just // moving the RenderData objects from vector to another. @@ -414,7 +414,7 @@ void Tr2FontMeasurer::CommitText( int shiftX, int shiftY ) void Tr2FontMeasurer::CancelLastText() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_renderData.empty() ) { @@ -488,7 +488,7 @@ int Tr2FontMeasurer::GetWidthAtIndex( int ix ) void Tr2FontMeasurer::DrawToAtlasTexture( Tr2AtlasTexture* atlasTexture ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !atlasTexture ) { @@ -514,7 +514,7 @@ void Tr2FontMeasurer::DrawToAtlasTexture( Tr2AtlasTexture* atlasTexture ) void Tr2FontMeasurer::DrawToTexture( TriTextureRes* texture ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -542,7 +542,7 @@ void Tr2FontMeasurer::DrawToTexture( TriTextureRes* texture ) void Tr2FontMeasurer::DrawToHostBitmap( Tr2HostBitmap* hostBitmap ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !hostBitmap || !hostBitmap->IsValid() || GetBytesPerPixel( hostBitmap->GetFormat() ) != 4 ) { @@ -579,7 +579,7 @@ void Tr2FontMeasurer::DrawToBuffer( uint32_t destWidth, void* pData, uint32_t pitch ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( uint32_t i = 0; i < destHeight; ++i ) { @@ -742,7 +742,7 @@ int Tr2FontMeasurer::GetFontSize() const void Tr2FontMeasurer::PrepareSprites( Tr2Sprite2dScene* renderer, const Vector2& translation, const Color& color, Tr2SpriteObjectEffect sfx, Tr2SpriteObjectBlendMode blendMode, Tr2SpriteTarget target, float glowBrightness, bool dropShadow, const Vector2& shadowOffset, const Color& shadowColor, Tr2SpriteObjectEffect shadowSfx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_vertices ) { @@ -1151,7 +1151,7 @@ void Tr2FontMeasurer::ClearSprites() unsigned int Tr2FontMeasurer::GetVertexCount() const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_vertices ) { @@ -1466,7 +1466,7 @@ void SBit_To_RGBABuffer( int top, int col ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); //set up the color in integers. RGBA color; @@ -1568,7 +1568,7 @@ void SBit_To_RGBABuffer( void Underline_To_RGBABuffer( void* destPtr, int dWidth, int dHeight, int dPitch, int left, int top, int width, int thickness, int col ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); //set up the color in integers. RGBA p; diff --git a/trinity/ITr2PickableScene.cpp b/trinity/ITr2PickableScene.cpp index a1c1691c3..f029f5d9c 100644 --- a/trinity/ITr2PickableScene.cpp +++ b/trinity/ITr2PickableScene.cpp @@ -36,7 +36,7 @@ // -------------------------------------------------------------------------------------- void ITr2PickableScene::PickObject( Tr2RenderContext& renderContext, int x, int y, TriProjection* proj, TriView* view, TriViewport* viewport, PickResults& results ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Backup current state Tr2Renderer::PushProjection(); diff --git a/trinity/Interior/Tr2IntSkinnedObject.cpp b/trinity/Interior/Tr2IntSkinnedObject.cpp index 319551702..40dffb080 100644 --- a/trinity/Interior/Tr2IntSkinnedObject.cpp +++ b/trinity/Interior/Tr2IntSkinnedObject.cpp @@ -163,7 +163,7 @@ void Tr2IntSkinnedObject::AddToApexScene( Tr2ApexScene* apexScene ) void Tr2IntSkinnedObject::RemoveFromApexScene( void ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_isInApexScene ) { diff --git a/trinity/Interior/Tr2InteriorScene.cpp b/trinity/Interior/Tr2InteriorScene.cpp index 6d7c7fc73..31eec69c4 100644 --- a/trinity/Interior/Tr2InteriorScene.cpp +++ b/trinity/Interior/Tr2InteriorScene.cpp @@ -404,7 +404,7 @@ void Tr2InteriorScene::SetVisualizationMode( int visualizationMode ) void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( simTime == m_lastUpdateTime ) // NB: Multiple calls on the same 'frame' should be ignored, @@ -423,7 +423,7 @@ void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) m_cameraPosVar = Tr2Renderer::GetViewPosition(); { - CCP_STATS_ZONE( "UpdateCurves" ); + TRINITY_STATS_ZONE( "UpdateCurves" ); for( TriCurveSetVector::const_iterator it = m_curveSets.begin(); it != m_curveSets.end(); ++it ) { ( *it )->Update( realTime, simTime ); @@ -431,7 +431,7 @@ void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) } { - CCP_STATS_ZONE( "PendingLoads" ); + TRINITY_STATS_ZONE( "PendingLoads" ); // Add any dynamics that have finished loading std::vector dynamicsToRemove; for( ssize_t index = 0; index < m_dynamicsPendingLoad.GetSize(); ++index ) @@ -455,7 +455,7 @@ void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) } { - CCP_STATS_ZONE( "PrePhysicsUpdate" ); + TRINITY_STATS_ZONE( "PrePhysicsUpdate" ); // Do the pre-physics update on the dynamics // Note: this used to happen in the cell pre-physics update, but that can cause double animation ticks // when a skinned object is intersecting multiple cells (e.g. crossing a portal) @@ -466,7 +466,7 @@ void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) } { - CCP_STATS_ZONE( "PostPhysicsUpdate" ); + TRINITY_STATS_ZONE( "PostPhysicsUpdate" ); // Do the post-physics update on the dynamics // Note: this used to happen in the cell post-physics update, but that can cause double animation ticks // when a skinned object is intersecting multiple cells (e.g. crossing a portal) @@ -477,7 +477,7 @@ void Tr2InteriorScene::Update( Be::Time realTime, Be::Time simTime ) } { - CCP_STATS_ZONE( "Update" ); + TRINITY_STATS_ZONE( "Update" ); for( PITr2InteriorLightVector::iterator it = m_lights.begin(); it != m_lights.end(); ++it ) { ( *it )->Update( simTime ); @@ -510,7 +510,7 @@ void Tr2InteriorScene::Render( Tr2RenderContext& renderContext ) // -------------------------------------------------------------------------------------- void Tr2InteriorScene::VisibilityQuery( Tr2VisibilityResults* results, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !results ) { @@ -586,7 +586,7 @@ void Tr2InteriorScene::ResolveVisibility( const Matrix& view, const Matrix& proj void Tr2InteriorScene::RenderFullForward( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); D3DPERF_EVENT( L"Tr2InteriorScene::RenderFullForward" ); @@ -682,7 +682,7 @@ void Tr2InteriorScene::SetupShadowMaps() // -------------------------------------------------------------------------------------- void Tr2InteriorScene::RenderShadows( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_renderShadows ) { @@ -810,7 +810,7 @@ void Tr2InteriorScene::RenderShadows( Tr2RenderContext& renderContext ) void Tr2InteriorScene::RenderGeometry( Tr2Material* overrideEffect, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // From now on its managed! renderContext.m_esm.BeginManagedRendering(); @@ -1099,7 +1099,7 @@ void Tr2InteriorScene::DoQueryBegin( const Tr2VisibilityEvent& event ) // -------------------------------------------------------------------------------------- void Tr2InteriorScene::DoInstanceVisible( const Tr2VisibilityEvent& event ) { - CCP_STATS_ZONE( "DoInstanceVisible" ); + TRINITY_STATS_ZONE( "DoInstanceVisible" ); { ITr2Interior* interior = dynamic_cast( event.m_userData.p ); diff --git a/trinity/Particle/Tr2DynamicEmitter.cpp b/trinity/Particle/Tr2DynamicEmitter.cpp index 7aeaa9c20..1ddb0a593 100644 --- a/trinity/Particle/Tr2DynamicEmitter.cpp +++ b/trinity/Particle/Tr2DynamicEmitter.cpp @@ -152,7 +152,7 @@ void Tr2DynamicEmitter::SpawnParticles( const UpdateArguments& arguments, const Vector3* velocity, float rateModifier ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_isValid || m_particleSystem == nullptr ) { diff --git a/trinity/Particle/Tr2ParticleSystem.cpp b/trinity/Particle/Tr2ParticleSystem.cpp index 869d3cc50..90c7c690d 100644 --- a/trinity/Particle/Tr2ParticleSystem.cpp +++ b/trinity/Particle/Tr2ParticleSystem.cpp @@ -484,7 +484,7 @@ void Tr2ParticleSystem::OnSimClockRebase( Be::Time oldTime, Be::Time newTime ) // -------------------------------------------------------------------------------------- void Tr2ParticleSystem::Update( const ITr2GenericEmitter::UpdateArguments& globalArguments ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto arguments = globalArguments; arguments.parentTransform = m_worldTransform; @@ -843,7 +843,7 @@ bool Tr2ParticleSystem::CompareParticles( unsigned particle1, unsigned particle2 // -------------------------------------------------------------------------------------- void Tr2ParticleSystem::UpdateAllSystems( const ITr2GenericEmitter::UpdateArguments& arguments ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); static Be::Time previousUpdateTime = -1; @@ -1020,7 +1020,7 @@ void Tr2ParticleSystem::ShiftOffsets( Tr2ParticleElementData::BufferType bufferT // -------------------------------------------------------------------------------------- void Tr2ParticleSystem::UpdateViewDependentData( const TriFrustum* frustum, const Matrix& worldTransform ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_shouldSortVisible = false; diff --git a/trinity/Particle/Tr2StaticEmitter.cpp b/trinity/Particle/Tr2StaticEmitter.cpp index f8b1fee82..0f7fe26e0 100644 --- a/trinity/Particle/Tr2StaticEmitter.cpp +++ b/trinity/Particle/Tr2StaticEmitter.cpp @@ -95,7 +95,7 @@ void Tr2StaticEmitter::SetThreadSafeFlag() // -------------------------------------------------------------------------------------- void Tr2StaticEmitter::DoSpawn() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto createDeclarationMap = []( const Tr2VertexDefinition& elements, const Tr2ParticleElementDataMap& particleElements, const std::string& geometryResourcePath, std::vector& geometryDeclarationMap ) -> bool { geometryDeclarationMap.clear(); diff --git a/trinity/PostProcess/Tr2PostProcessRenderer.cpp b/trinity/PostProcess/Tr2PostProcessRenderer.cpp index 7be3b3076..e4b444edb 100644 --- a/trinity/PostProcess/Tr2PostProcessRenderer.cpp +++ b/trinity/PostProcess/Tr2PostProcessRenderer.cpp @@ -656,7 +656,7 @@ void Tr2PostProcessRenderer::Execute( Tr2GpuResourcePool& gpuResourcePool, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !sourceBuffer.IsValid() ) { diff --git a/trinity/Raytracing/Tr2RaytracingGeometry.cpp b/trinity/Raytracing/Tr2RaytracingGeometry.cpp index 59b448999..b7ef7c962 100644 --- a/trinity/Raytracing/Tr2RaytracingGeometry.cpp +++ b/trinity/Raytracing/Tr2RaytracingGeometry.cpp @@ -405,7 +405,7 @@ const Tr2RtBottomLevelAccelerationStructureAL& Tr2RaytracingMeshArea::BuildBlas( if( rebuild ) { - CCP_STATS_ZONE( "BLAS rebuild" ); + TRINITY_STATS_ZONE( "BLAS rebuild" ); auto capacity = geometry; auto highestLod = mesh.GetHighestLodData(); @@ -639,7 +639,7 @@ void Tr2RaytracingGeometry::PrepareShaderTableDescription( Tr2RenderContext& ren CCP_ASSERT_M( numRaycasters > 0, "numRaycasters has to be greater than zero! Why are you preparing shader tables when you have no raycasters?" ); GPU_REGION( renderContext, "PrepareShaderTableDescription" ); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( int32_t i = 0; i < numRaycasters; i++ ) { *shaderTableDescs[i] = Tr2RtShaderTableDescriptionAL(); @@ -744,7 +744,7 @@ struct SkinningShaderCBuffer void Tr2RaytracingGeometry::TransformMeshes( Tr2RenderContext& renderContext ) { GPU_REGION( renderContext, "TransformMeshes" ); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); #if TRINITY_PLATFORM == TRINITY_DIRECTX12 renderContext.PushDisableUAVBarriersDx12(); @@ -767,11 +767,11 @@ void Tr2RaytracingGeometry::TransformMeshes( Tr2RenderContext& renderContext ) outdatedMeshes.reserve( m_geometryData.size() ); { - CCP_STATS_ZONE( "Prepare BoneTransformBuffer" ); + TRINITY_STATS_ZONE( "Prepare BoneTransformBuffer" ); Tr2RingBuffer::GetInstance().PrepareBuffer( renderContext ); } { - CCP_STATS_ZONE( "Prepare MorphTargetAnimationDataBuffer" ); + TRINITY_STATS_ZONE( "Prepare MorphTargetAnimationDataBuffer" ); Tr2RingBuffer::GetInstance().PrepareBuffer( renderContext ); } @@ -835,7 +835,7 @@ void Tr2RaytracingGeometry::TransformMeshes( Tr2RenderContext& renderContext ) if( !outdatedMeshes.empty() ) { - CCP_STATS_ZONE( "Dispatch" ); + TRINITY_STATS_ZONE( "Dispatch" ); auto perObjVSRegister = Tr2Renderer::GetPerObjectVSStartRegister(); @@ -952,7 +952,7 @@ void Tr2RaytracingGeometry::TransformMeshes( Tr2RenderContext& renderContext ) void Tr2RaytracingGeometry::BuildAccelerationStructures( Tr2RenderContext& renderContext ) { GPU_REGION( renderContext, "BuildAccelerationStructures" ); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); #if TRINITY_PLATFORM == TRINITY_DIRECTX12 renderContext.FlushBarriersDx12(); @@ -1000,14 +1000,14 @@ void Tr2RaytracingGeometry::BuildAccelerationStructures( Tr2RenderContext& rende } { - CCP_STATS_ZONE( "TLAS update" ); + TRINITY_STATS_ZONE( "TLAS update" ); if( instances.empty() ) { m_tlas = Tr2RtTopLevelAccelerationStructureAL(); } else if( FAILED( m_tlas.Update( instances.size(), instances.data(), renderContext ) ) ) { - CCP_STATS_ZONE( "TLAS create" ); + TRINITY_STATS_ZONE( "TLAS create" ); m_tlas.Create( instances.size(), instances.data(), Tr2RtBuildFlags::PREFER_FAST_TRACE, renderContext.GetPrimaryRenderContext() ); } } diff --git a/trinity/Raytracing/Tr2RaytracingManager.cpp b/trinity/Raytracing/Tr2RaytracingManager.cpp index f4efef0fb..49c106d35 100644 --- a/trinity/Raytracing/Tr2RaytracingManager.cpp +++ b/trinity/Raytracing/Tr2RaytracingManager.cpp @@ -89,7 +89,7 @@ Tr2GpuResourcePool::Texture Tr2RaytracingManager::RenderShadows( { renderContext.AddGpuMarker( __FUNCTION__ ); GPU_REGION( renderContext, "Raytraced shadows" ); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto destination = gpuResourcePool.GetTempTexture( "raytracing_shadow_dest", depth.GetWidth(), depth.GetHeight(), Tr2RenderContextEnum::PIXEL_FORMAT_R8_UNORM, Tr2GpuUsage::RENDER_TARGET | Tr2GpuUsage::UNORDERED_ACCESS | Tr2GpuUsage::SHADER_RESOURCE ); @@ -128,7 +128,7 @@ Tr2GpuResourcePool::Texture Tr2RaytracingManager::RenderShadows( } { - CCP_STATS_ZONE( "Create shader table" ); + TRINITY_STATS_ZONE( "Create shader table" ); m_shaderTableDesc.AddRayGenShader( rayGenName.c_str() ); m_shaderTableDesc.AddMissShader( missName.c_str() ); m_shadowShaderTable.Create( m_shaderTableDesc, pipelineState, renderContext.GetPrimaryRenderContext() ); @@ -172,7 +172,7 @@ Tr2GpuResourcePool::Texture Tr2RaytracingManager::RenderShadows( renderContext.SetConstants( m_shadowPerFrameData, Tr2RenderContextEnum::COMPUTE_SHADER, 2 ); { - CCP_STATS_ZONE( "renderContext.UseResources" ); + TRINITY_STATS_ZONE( "renderContext.UseResources" ); renderContext.UseResources( Tr2UseResourceDestination::COMPUTE, Tr2GpuUsage::SHADER_RESOURCE, m_geometry->GetBindlessResources() ); } diff --git a/trinity/RenderJob/Tr2RenderJobs.cpp b/trinity/RenderJob/Tr2RenderJobs.cpp index 172f22d8c..f5538cb34 100644 --- a/trinity/RenderJob/Tr2RenderJobs.cpp +++ b/trinity/RenderJob/Tr2RenderJobs.cpp @@ -22,7 +22,7 @@ Tr2RenderJobs::~Tr2RenderJobs() void Tr2RenderJobs::Run( Be::Time realTime, Be::Time simTime ) { - CCP_STATS_SCOPED_TIME( deviceRenderJobs ); + TRINITY_STATS_SCOPED_TIME( deviceRenderJobs ); CCP_STATS_SET( deviceChainedRenderJobsCount, m_scheduledChained.size() ); CCP_STATS_SET( deviceOnceRenderJobsCount, m_scheduledOnce.size() ); diff --git a/trinity/RenderJob/TriStepPythonCB.cpp b/trinity/RenderJob/TriStepPythonCB.cpp index fc88810c0..89397c0a6 100644 --- a/trinity/RenderJob/TriStepPythonCB.cpp +++ b/trinity/RenderJob/TriStepPythonCB.cpp @@ -21,7 +21,7 @@ void TriStepPythonCB::SetCallback( const BlueScriptCallback& callback ) TriStepResult TriStepPythonCB::Execute( Be::Time realTime, Be::Time simTime, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_STATS_INC( rsPythonCBCount ); if( m_callback ) diff --git a/trinity/RenderJob/TriStepResolve.cpp b/trinity/RenderJob/TriStepResolve.cpp index 989cce6c4..79bc421c3 100644 --- a/trinity/RenderJob/TriStepResolve.cpp +++ b/trinity/RenderJob/TriStepResolve.cpp @@ -12,7 +12,7 @@ TriStepResolve::TriStepResolve( IRoot* lockobj ) : TriStepResult TriStepResolve::Execute( Be::Time realTime, Be::Time simTime, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_source || !m_destination || !m_source->GetRenderTarget().IsValid() || !m_destination->GetRenderTarget().IsValid() ) { diff --git a/trinity/RenderJob/TriStepRunComputeShader.cpp b/trinity/RenderJob/TriStepRunComputeShader.cpp index 4e485b6ab..038ac7978 100644 --- a/trinity/RenderJob/TriStepRunComputeShader.cpp +++ b/trinity/RenderJob/TriStepRunComputeShader.cpp @@ -36,7 +36,7 @@ void TriStepRunComputeShader::py__init__( TriStepResult TriStepRunComputeShader::Execute( Be::Time realTime, Be::Time simTime, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_STATS_INC( rsRunComputeShaderCount ); if( m_indirectionBuffer ) diff --git a/trinity/RenderJob/TriStepRunJob.cpp b/trinity/RenderJob/TriStepRunJob.cpp index 10f43d224..dd94e12a2 100644 --- a/trinity/RenderJob/TriStepRunJob.cpp +++ b/trinity/RenderJob/TriStepRunJob.cpp @@ -14,7 +14,7 @@ TriStepRunJob::~TriStepRunJob( void ) TriStepResult TriStepRunJob::Execute( Be::Time realTime, Be::Time simTime, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( m_name.c_str() ); + TRINITY_STATS_ZONE( m_name.c_str() ); if( !m_job ) { diff --git a/trinity/Resources/Tr2CmfContent.cpp b/trinity/Resources/Tr2CmfContent.cpp index 0ce22f8e9..5daa8f48b 100644 --- a/trinity/Resources/Tr2CmfContent.cpp +++ b/trinity/Resources/Tr2CmfContent.cpp @@ -67,7 +67,7 @@ const void* Tr2CmfContents::GetSection( uint32_t index ) return nullptr; } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto decompressed = std::make_unique( section.section.uncompressedSize ); cmf::Decompress( decompressed.get(), section.section, section.data.get() ); diff --git a/trinity/Resources/Tr2EffectRes.cpp b/trinity/Resources/Tr2EffectRes.cpp index d4b6db6a8..81e2ea64f 100644 --- a/trinity/Resources/Tr2EffectRes.cpp +++ b/trinity/Resources/Tr2EffectRes.cpp @@ -137,7 +137,7 @@ Tr2ShaderPtr Tr2EffectRes::GetShader( const Tr2ShaderOption* options, size_t cou BlueAsyncRes::LoadingResult Tr2EffectRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_version = 0; m_data.clear(); diff --git a/trinity/Resources/Tr2GrannyStateRes.cpp b/trinity/Resources/Tr2GrannyStateRes.cpp index 5606f7229..93b6c3306 100644 --- a/trinity/Resources/Tr2GrannyStateRes.cpp +++ b/trinity/Resources/Tr2GrannyStateRes.cpp @@ -49,7 +49,7 @@ size_t Tr2GrannyStateRes::GetMemoryUsage() BlueAsyncRes::LoadingResult Tr2GrannyStateRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_dataStream->LockData( &m_data, 0 ) ) { @@ -65,7 +65,7 @@ BlueAsyncRes::LoadingResult Tr2GrannyStateRes::DoLoad() m_characterFile = NULL; } - CCP_STATS_ZONE( "Tr2GrannyStateRes::DoLoad reading Granny file" ); + TRINITY_STATS_ZONE( "Tr2GrannyStateRes::DoLoad reading Granny file" ); m_characterFile = ProtectedGrannyReadEntireFileFromMemory( m_path.c_str(), (uint32_t)m_dataSize, m_data ); } if( !m_characterFile ) diff --git a/trinity/Resources/Tr2ImageRes.cpp b/trinity/Resources/Tr2ImageRes.cpp index 7d1baadeb..72c49db81 100644 --- a/trinity/Resources/Tr2ImageRes.cpp +++ b/trinity/Resources/Tr2ImageRes.cpp @@ -30,7 +30,7 @@ size_t Tr2ImageRes::GetMemoryUsage() BlueAsyncRes::LoadingResult Tr2ImageRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_dataStream ) { diff --git a/trinity/Resources/Tr2TextureLodManager.cpp b/trinity/Resources/Tr2TextureLodManager.cpp index 5bbc163c1..d4390d32e 100644 --- a/trinity/Resources/Tr2TextureLodManager.cpp +++ b/trinity/Resources/Tr2TextureLodManager.cpp @@ -63,7 +63,7 @@ Tr2TextureLodManager& Tr2TextureLodManager::Instance() void Tr2TextureLodManager::OnTick( Be::Time, Be::Time, void* ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( auto& it : m_textures ) { diff --git a/trinity/Resources/TriGeometryRes.cpp b/trinity/Resources/TriGeometryRes.cpp index fc5472ad6..79cbdf28b 100644 --- a/trinity/Resources/TriGeometryRes.cpp +++ b/trinity/Resources/TriGeometryRes.cpp @@ -87,7 +87,7 @@ BVH::BoundingVolumeHierarchy& Tr2RaycastGeometryRes::GetBVH() BlueAsyncRes::LoadingResult Tr2RaycastGeometryRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_dataStream ) { @@ -520,7 +520,7 @@ void TriGeometryRes::GetDescription( std::string& desc ) // This gets called on the background loading thread BlueAsyncRes::LoadingResult TriGeometryRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_cmfContents ) { @@ -587,7 +587,7 @@ BlueAsyncRes::LoadingResult TriGeometryRes::DoLoad() // This gets called on the main thread bool TriGeometryRes::DoPrepare() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -656,7 +656,7 @@ bool TriGeometryRes::DoPrepare() #if WITH_GRANNY void TriGeometryRes::DetermineAreaBoundsAndVertCount( TriGeometryResAreaData& area, granny_mesh* grannyMesh, int bytesPerVertex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Determine bounds for area // Assume that position is the first component @@ -697,7 +697,7 @@ void TriGeometryRes::DetermineAreaBoundsAndVertCount( TriGeometryResAreaData& ar #if WITH_GRANNY bool TriGeometryRes::IsAreaSkinned( TriGeometryResAreaData& area, granny_mesh* grannyMesh, granny_file_info* gi, int bytesPerVertex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // offset to boneindex int boneIndexOffset = GetVertexComponentOffset( grannyMesh, GrannyVertexBoneIndicesName ); // if there are no bone-indices , we are done @@ -780,7 +780,7 @@ bool TriGeometryRes::IsAreaSkinned( TriGeometryResAreaData& area, granny_mesh* g bool TriGeometryRes::IsAreaMorphed( TriGeometryResAreaData& area, granny_mesh* myMesh, granny_file_info* gi ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( myMesh->MorphTargetCount == 0 ) { @@ -835,7 +835,7 @@ bool TriGeometryRes::IsAreaMorphed( TriGeometryResAreaData& area, granny_mesh* m bool TriGeometryRes::SetupMeshes( const cmf::Data& cmfData ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); int minimumLOD = gTriDev->GetMinimumModelLOD(); @@ -933,7 +933,7 @@ bool TriGeometryRes::SetupMeshes( const cmf::Data& cmfData ) #if WITH_GRANNY bool TriGeometryRes::SetupMeshes( granny_file_info* gi ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT_M( !m_useCMF, "TriGeometryRes::SetupMeshes: intern messed up cmf loading" ); @@ -1167,7 +1167,7 @@ bool TriGeometryRes::SetupMeshes( granny_file_info* gi ) void TriGeometryRes::SetupSkeletons( const cmf::Data& cmfData ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_skeletons.resize( cmfData.skeletons.size() ); for( int skelIx = 0; skelIx < cmfData.skeletons.size(); ++skelIx ) @@ -1192,7 +1192,7 @@ void TriGeometryRes::SetupSkeletons( const cmf::Data& cmfData ) #if WITH_GRANNY void TriGeometryRes::SetupSkeletons( granny_file_info* gi ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT_M( !m_useCMF, "TriGeometryRes::SetupSkeletons: intern messed up cmf loading" ); @@ -1224,7 +1224,7 @@ void TriGeometryRes::SetupSkeletons( granny_file_info* gi ) bool TriGeometryRes::ReadCMFFile() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_useCMF = true; m_cmfContents = Tr2CmfContents( *m_dataStream, CW2A( m_path.c_str() ) ); @@ -1245,7 +1245,7 @@ bool TriGeometryRes::ReadCMFFile() #if WITH_GRANNY bool TriGeometryRes::ReadGrannyFile() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_useCMF = false; @@ -1282,7 +1282,7 @@ bool TriGeometryRes::ReadGrannyFile() void TriGeometryRes::PrepareFromGrannyRes( TriGrannyRes* g ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); if( g->IsUsingCMF() ) @@ -1327,7 +1327,7 @@ void TriGeometryRes::PrepareFromGrannyRes( TriGrannyRes* g ) //This entire function is sus. We should be able to compute this when we upload the mesh to the GPU, as it can never change unless the vertex data changes. void TriGeometryRes::RecalculateBoundingSphere() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); for( auto& mesh : m_meshes ) @@ -1408,7 +1408,7 @@ static void ConvertTriangleData( Tr2VertexDefinition::DataType elementType, unsi void TriGeometryRes::ProcessMeshTriangles( int meshIx, PerTriangleCallback cb, void* cbContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); int i = meshIx; @@ -2000,7 +2000,7 @@ TriMorphTargetGeometryConstants CreateMorphGeometryConstants( const Tr2VertexDef #if WITH_GRANNY float CalculateMorphDeformationAmount( bool dataIsDeltas, int32_t vertexCount, uint8_t* pMorphSrc, Tr2VertexDefinition morphDecl, uint8_t* pVertices, Tr2VertexDefinition decl ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); MorphToBaseData baseData = InitMorphToBaseData( decl ); MorphToBaseData morphData = InitMorphToBaseData( morphDecl ); @@ -2018,7 +2018,7 @@ float CalculateMorphDeformationAmount( bool dataIsDeltas, int32_t vertexCount, u bool TriGeometryRes::CreateLodFromCMFMesh( Tr2CmfContents& cmfContents, const cmf::Mesh& cmfMesh, const cmf::MeshLod& cmfMeshLod, TriGeometryResLodData* lod, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !Tr2Renderer::IsResourceCreationAllowed() ) { @@ -2144,7 +2144,7 @@ bool TriGeometryRes::CreateLodFromCMFMesh( Tr2CmfContents& cmfContents, const cm #if WITH_GRANNY bool TriGeometryRes::CreateLodFromGrannyMesh( granny_mesh* grannyMesh, TriGeometryResLodData* lod, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext, void* pVBOverride ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !Tr2Renderer::IsResourceCreationAllowed() || grannyMesh == NULL ) { @@ -2303,7 +2303,7 @@ bool TriGeometryRes::CreateLodFromGrannyMesh( granny_mesh* grannyMesh, TriGeomet bool TriGeometryRes::CreateMeshesFromCMFFile( Tr2CmfContents& cmfContents, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !cmfContents.GetData() ) { @@ -2356,7 +2356,7 @@ static granny_mesh* FindOcclusionMesh( granny_file_info* gi, const std::string& bool TriGeometryRes::CreateMeshesFromGrannyFile( granny_file_info* gi, Tr2CpuUsage::Type cpuUsage, Tr2PrimaryRenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( auto& mesh : m_meshes ) { diff --git a/trinity/Resources/TriGrannyRes.cpp b/trinity/Resources/TriGrannyRes.cpp index c666ef5d1..7231c5d58 100644 --- a/trinity/Resources/TriGrannyRes.cpp +++ b/trinity/Resources/TriGrannyRes.cpp @@ -199,7 +199,7 @@ bool TriGrannyRes::Load( const std::string& path ) BlueAsyncRes::LoadingResult TriGrannyRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_path.size() >= 4 && m_path.compare( m_path.size() - 4, 4, L".cmf" ) == 0 ) { @@ -233,7 +233,7 @@ BlueAsyncRes::LoadingResult TriGrannyRes::DoLoad() m_grannyFile = NULL; } - CCP_STATS_ZONE( "TriGrannyRes::DoLoad reading Granny file" ); + TRINITY_STATS_ZONE( "TriGrannyRes::DoLoad reading Granny file" ); m_grannyFile = ProtectedGrannyReadEntireFileFromMemory( m_path.c_str(), (uint32_t)m_dataSize, m_data ); } @@ -422,7 +422,7 @@ bool TriGrannyRes::BakeBlendshape( unsigned int meshIx, const NameToWeightMap& n bool TriGrannyRes::BakeBlendshape( unsigned int meshIx, const std::vector& weights, Tr2SuballocatedBuffer::Allocation& pVertexData, Tr2RenderContextAL& renderContext, unsigned int vertexDataSize, const NameToWeightMap* const nameToWeight, bool deltaOnly ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( IsUsingCMF() ) { diff --git a/trinity/Resources/TriTextureRes.cpp b/trinity/Resources/TriTextureRes.cpp index 474d0da36..85d60156d 100644 --- a/trinity/Resources/TriTextureRes.cpp +++ b/trinity/Resources/TriTextureRes.cpp @@ -180,7 +180,7 @@ unsigned TriTextureRes::ComputeMipSkipCount() void TriTextureRes::RasterizeProceduralTexture( const wchar_t* data, void ( *Rastrization )( const std::string_view&, ImageIO::HostBitmap& ) ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_isGood = false; m_isPrepared = false; @@ -571,7 +571,7 @@ static bool IsTga( const wchar_t* filename ) // Called on background thread BlueAsyncRes::LoadingResult TriTextureRes::DoLoad() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); BeTimer t; @@ -661,7 +661,7 @@ BlueAsyncRes::LoadingResult TriTextureRes::DoLoad() // Called on main thread bool TriTextureRes::DoPrepare() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_lodEnabled ) { @@ -776,7 +776,7 @@ void TriTextureRes::ProcessLodRequest( const Tr2TextureLodUpdateRequest& request { if( request.cachedInRam ) { - CCP_STATS_ZONE( "CreateTexture" ); + TRINITY_STATS_ZONE( "CreateTexture" ); USE_MAIN_THREAD_RENDER_CONTEXT(); diff --git a/trinity/Shader/Tr2Effect.cpp b/trinity/Shader/Tr2Effect.cpp index ec59b317a..179bb4794 100644 --- a/trinity/Shader/Tr2Effect.cpp +++ b/trinity/Shader/Tr2Effect.cpp @@ -308,7 +308,7 @@ bool Tr2Effect::OnPrepareResources() static bool ConvertEffectPath( const std::string& path, std::string& actualPath ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); actualPath = std::string( path.size() + 8 + 10, 0 ); const char* str = actualPath.c_str(); @@ -373,7 +373,7 @@ static bool ConvertEffectPath( const std::string& path, std::string& actualPath // --------------------------------------------------------------- bool Tr2Effect::Initialize() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); for( auto it = begin( m_resources ); it != end( m_resources ); ++it ) { @@ -682,7 +682,7 @@ void Tr2Effect::RebuildCachedDataInternal() m_shader = m_effectResource->GetShader( m_options.empty() ? nullptr : &m_options[0], m_options.size() ); if( m_shader ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); for( auto& over : m_samplerOverrides ) @@ -822,7 +822,7 @@ void Tr2Effect::RebuildCachedDataInternal() void Tr2Effect::RebuildCachedData( BlueAsyncRes* p ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( p == m_effectResource ); if( p == m_effectResource ) @@ -841,7 +841,7 @@ void Tr2Effect::RebuildCachedData() void Tr2Effect::ReleaseCachedData( BlueAsyncRes* p ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( p == m_effectResource ); if( p == m_effectResource ) { @@ -870,7 +870,7 @@ void Tr2Effect::ReleaseCachedData( BlueAsyncRes* p ) // --------------------------------------------------------------- bool Tr2Effect::OnModified( Be::Var* value ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // m_effectFilePath is the only attribute with a notify flag Initialize(); @@ -900,7 +900,7 @@ void Tr2Effect::EndUpdate() // --------------------------------------------------------------- void Tr2Effect::OnListModified( long event, ssize_t key, ssize_t key2, IRoot* currvalue, const IList* theList ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( ( event & BELIST_LOADING ) == 0 ) { @@ -940,7 +940,7 @@ void Tr2Effect::OnListModified( long event, ssize_t key, ssize_t key2, IRoot* cu // --------------------------------------------------------------- bool Tr2Effect::PopulateParameters() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_shader ) { @@ -1076,7 +1076,7 @@ bool Tr2Effect::PopulateParameters() // --------------------------------------------------------------- bool Tr2Effect::PruneParameters() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_shader ) { @@ -1222,7 +1222,7 @@ const char* Tr2Effect::GetEffectPathName() const ITriEffectParameter* Tr2Effect::GetParameterByName( const char* name ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); ITriEffectParameter* result = FindParameterByName( name ); @@ -1435,7 +1435,7 @@ bool ExtractLodingAnnotations( std::arrayGetParameterAnnotations( paramName ), annotationName, defaultValue ) : defaultValue; } @@ -1727,7 +1727,7 @@ void Tr2Effect::MapPassParameters( const Tr2EffectDescription& descriptionDesc, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); static const size_t MAX_PARAMS = 128; diff --git a/trinity/Sprite2d/Tr2Sprite2dArc.cpp b/trinity/Sprite2d/Tr2Sprite2dArc.cpp index bc13e3d10..a6f043016 100644 --- a/trinity/Sprite2d/Tr2Sprite2dArc.cpp +++ b/trinity/Sprite2d/Tr2Sprite2dArc.cpp @@ -48,7 +48,7 @@ unsigned int Tr2Sprite2dArc::GetVertexCount() void Tr2Sprite2dArc::GatherSprites( Tr2Sprite2dScene* renderer ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display || ( m_spriteEffect == TR2_SFX_NONE ) || ( m_radius == 0.0f ) || ( m_startAngle >= m_endAngle ) ) { diff --git a/trinity/Sprite2d/Tr2Sprite2dLine.cpp b/trinity/Sprite2d/Tr2Sprite2dLine.cpp index ece8b02dc..57faf9503 100644 --- a/trinity/Sprite2d/Tr2Sprite2dLine.cpp +++ b/trinity/Sprite2d/Tr2Sprite2dLine.cpp @@ -30,7 +30,7 @@ Tr2Sprite2dLine::Tr2Sprite2dLine( IRoot* lockobj /*= NULL */ ) : void Tr2Sprite2dLine::GatherSprites( Tr2Sprite2dScene* renderer ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display || ( m_spriteEffect == TR2_SFX_NONE ) ) { diff --git a/trinity/Sprite2d/Tr2Sprite2dLineTrace.cpp b/trinity/Sprite2d/Tr2Sprite2dLineTrace.cpp index 740e711bb..654e184ea 100644 --- a/trinity/Sprite2d/Tr2Sprite2dLineTrace.cpp +++ b/trinity/Sprite2d/Tr2Sprite2dLineTrace.cpp @@ -38,7 +38,7 @@ Tr2Sprite2dLineTrace::~Tr2Sprite2dLineTrace() void Tr2Sprite2dLineTrace::GatherSprites( Tr2Sprite2dScene* renderer ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_display || m_vertices.empty() || ( m_end <= m_start ) || ( m_spriteEffect == TR2_SFX_NONE ) ) { diff --git a/trinity/Sprite2d/Tr2Sprite2dRenderJob.cpp b/trinity/Sprite2d/Tr2Sprite2dRenderJob.cpp index c6303e687..aaa781d9f 100644 --- a/trinity/Sprite2d/Tr2Sprite2dRenderJob.cpp +++ b/trinity/Sprite2d/Tr2Sprite2dRenderJob.cpp @@ -16,7 +16,7 @@ Tr2Sprite2dRenderJob::~Tr2Sprite2dRenderJob() void Tr2Sprite2dRenderJob::GatherSprites( Tr2Sprite2dScene* renderer ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_renderJob && m_display ) { diff --git a/trinity/Sprite2d/Tr2Sprite2dScene.cpp b/trinity/Sprite2d/Tr2Sprite2dScene.cpp index 29d9c2f12..4f064f159 100644 --- a/trinity/Sprite2d/Tr2Sprite2dScene.cpp +++ b/trinity/Sprite2d/Tr2Sprite2dScene.cpp @@ -192,7 +192,7 @@ Tr2Sprite2dScene::~Tr2Sprite2dScene() void Tr2Sprite2dScene::Update( Be::Time realTime, Be::Time simTime ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_realTime = realTime; m_simTime = simTime; @@ -222,7 +222,7 @@ void Tr2Sprite2dScene::Update( Be::Time realTime, Be::Time simTime ) void Tr2Sprite2dScene::Render( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); D3DPERF_EVENT( L"Tr2Sprite2dScene::Render" ); if( !m_display || !renderContext.IsValid() ) @@ -385,7 +385,7 @@ void Tr2Sprite2dScene::RenderDebugInfo( Tr2RenderContext& renderContext ) void Tr2Sprite2dScene::PushTranslation( const Vector2& t ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); TransformStackEntry entry; entry.isTranslationOnlySet = true; @@ -419,7 +419,7 @@ void Tr2Sprite2dScene::PushTranslation( const Vector2& t ) void Tr2Sprite2dScene::PopTranslation() { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( !m_transformStack->empty() ); CCP_ASSERT( m_transformStack->back().isTranslationOnlySet ); @@ -444,7 +444,7 @@ const Vector2& Tr2Sprite2dScene::GetTranslation() const void Tr2Sprite2dScene::PushDepthRange( float depthMin, float depthMax ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_is2dRenderContext ) { @@ -471,7 +471,7 @@ void Tr2Sprite2dScene::PushDepthRange( float depthMin, float depthMax ) void Tr2Sprite2dScene::PopDepthRange() { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_is2dRenderContext ) { @@ -484,7 +484,7 @@ void Tr2Sprite2dScene::PopDepthRange() void Tr2Sprite2dScene::SetDepth( float depth ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_is2dRenderContext ) { @@ -499,7 +499,7 @@ void Tr2Sprite2dScene::SetDepth( float depth ) void Tr2Sprite2dScene::PushTransform( const Matrix& m ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); TransformStackEntry entry; entry.isTranslationOnly = false; @@ -529,7 +529,7 @@ void Tr2Sprite2dScene::PushTransform( const Matrix& m ) void Tr2Sprite2dScene::PopTransform() { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( !m_transformStack->empty() ); CCP_ASSERT( !m_transformStack->back().isTranslationOnly ); @@ -557,7 +557,7 @@ void Tr2Sprite2dScene::PopTransformAbsolute() void Tr2Sprite2dScene::PushClipRectangle( float x, float y, float width, float height ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( width >= 0.0f ); CCP_ASSERT( height >= 0.0f ); @@ -678,7 +678,7 @@ void Tr2Sprite2dScene::PushClipRectangle( float x, float y, float width, float h void Tr2Sprite2dScene::PopClipRectangle() { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_ignoreClip ) { @@ -705,7 +705,7 @@ const Tr2Sprite2dClipRect& Tr2Sprite2dScene::GetClipRectangle() const void Tr2Sprite2dScene::SetTexture( unsigned ix, Tr2AtlasTexturePtr tex, Tr2Sprite2dTextureSettings settings ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_STATS_INC( spriteSceneTextureCount ); @@ -780,7 +780,7 @@ void Tr2Sprite2dScene::SetTexture( unsigned ix, Tr2AtlasTexturePtr tex, Tr2Sprit void Tr2Sprite2dScene::SetTextureWindow( unsigned int ix, float x, float y, float width, float height ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( ix < 2 ); @@ -793,7 +793,7 @@ void Tr2Sprite2dScene::SetTextureWindow( unsigned int ix, float x, float y, floa void Tr2Sprite2dScene::SetTextureTransform( unsigned int ix, Matrix* m ) { - //CCP_STATS_ZONE( __FUNCTION__ ); + //TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( ix < 2 ); @@ -832,7 +832,7 @@ bool Tr2Sprite2dScene::PrepareSpriteVerts( float height, Tr2SpriteObjectEffect sfx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !TexturesReady() ) { @@ -889,7 +889,7 @@ bool Tr2Sprite2dScene::PrepareSpriteVerts( } { - //CCP_STATS_ZONE( __FUNCTION__ " vertices" ); + //TRINITY_STATS_ZONE( __FUNCTION__ " vertices" ); for( int i = 0; i < 4; ++i ) { Tr2Sprite2dD3DVertex& vertex = destVerts[i]; @@ -924,7 +924,7 @@ bool Tr2Sprite2dScene::PrepareSpriteVerts( bool Tr2Sprite2dScene::PrepareTriangleVerts( Tr2Sprite2dD3DVertex* destVerts, Tr2Sprite2dVertexBase* verts, unsigned int stride, unsigned int vertexCount ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !TexturesReady() ) { @@ -1048,7 +1048,7 @@ void Tr2Sprite2dScene::IssueDrawCall() { USE_MAIN_THREAD_RENDER_CONTEXT(); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_STATS_INC( spriteSceneDrawCallCount ); if( !m_indexCount ) @@ -1165,7 +1165,7 @@ void Tr2Sprite2dScene::IssueDrawCall() void Tr2Sprite2dScene::SubmitGeometry( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Error checking is done in IssueDrawCall - we won't get here unless the effect // is valid, as well as the constant table and transforms handle. @@ -1592,7 +1592,7 @@ bool Tr2Sprite2dScene::IsInsideTriangle( const Vector2& pointIn, const Vector2& void Tr2Sprite2dScene::StartLayer( Tr2TextureAL& rt ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); D3DPERF_EVENT( L"Tr2Sprite2dScene::StartLayer" ); @@ -1631,7 +1631,7 @@ void Tr2Sprite2dScene::StartLayer( Tr2TextureAL& rt ) void Tr2Sprite2dScene::EndLayer( float x, float y, float width, float height, ITr2Sprite2dTexture* secondaryTexture ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); D3DPERF_EVENT( L"Tr2Sprite2dScene::EndLayer" ); @@ -1754,7 +1754,7 @@ float Tr2Sprite2dScene::GetAccumulatedAlpha() const void Tr2Sprite2dScene::RunJob( TriRenderJob* job ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( job ); @@ -1940,7 +1940,7 @@ void Tr2Sprite2dScene::SetGlowBrightness( float glowBrightness ) ////////////////////////////////////////////////////////////////////////// bool Tr2Sprite2dScene::StartCapture( ITr2SpriteObject* owner ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_STATS_INC( spriteSceneDisplayListsCreated ); CCP_ASSERT( !m_captureDisplayList ); @@ -1973,7 +1973,7 @@ bool Tr2Sprite2dScene::StartCapture( ITr2SpriteObject* owner ) Tr2Sprite2dDisplayList* Tr2Sprite2dScene::EndCapture( Tr2Sprite2dDisplayList* previousDisplayList ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( m_captureDisplayList ); if( !m_captureDisplayList ) @@ -2072,7 +2072,7 @@ Tr2Sprite2dDisplayList* Tr2Sprite2dScene::EndCapture( Tr2Sprite2dDisplayList* pr void Tr2Sprite2dScene::ReplayCapture( Tr2Sprite2dDisplayList* dl ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -2462,7 +2462,7 @@ void Tr2Sprite2dScene::SetSpriteVerticesUVs( Vector2 uv[2][4], float width, floa // vertices that need to be added. void Tr2Sprite2dScene::GrowCaptureVertexBuffer( unsigned int vertexCount ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_captureVertexDataCapacity *= 2; if( m_captureVertexDataSize + vertexCount >= m_captureVertexDataCapacity ) @@ -2480,7 +2480,7 @@ void Tr2Sprite2dScene::GrowCaptureVertexBuffer( unsigned int vertexCount ) // indices that need to be added. void Tr2Sprite2dScene::GrowCaptureIndexBuffer( unsigned short indexCount ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_captureIndexDataCapacity *= 2; if( m_captureIndexDataSize + indexCount >= m_captureIndexDataCapacity ) @@ -2512,7 +2512,7 @@ bool Tr2Sprite2dScene::EnsureBufferSpace( unsigned int vertexCount, unsigned sho { if( m_captureDisplayList ) { - CCP_STATS_ZONE( "Tr2Sprite2dScene::EnsureBufferSpace capture" ); + TRINITY_STATS_ZONE( "Tr2Sprite2dScene::EnsureBufferSpace capture" ); // Ensure we have enough space for vertices. if( m_captureVertexDataSize + vertexCount >= m_captureVertexDataCapacity ) diff --git a/trinity/StdAfx.h b/trinity/StdAfx.h index d3e5d32f7..95e2cf7ed 100644 --- a/trinity/StdAfx.h +++ b/trinity/StdAfx.h @@ -149,5 +149,16 @@ using std::max; GPU_REGION_AL( renderContext, label ); \ Tr2GpuProfilerZone _profilerZone##__COUNTER__( nullptr, label, renderContext ); +#ifdef PYTHON2_SUPPORT +#define TRINITY_STATS_ZONE( name ) CCP_STATS_ZONE( name ) +#define TRINITY_STATS_SCOPED_TIME( identifier ) CCP_STATS_SCOPED_TIME( identifier ) +#else + +const CcpTelemetryCategory& TrinityTelemetryCategory(); +#define TRINITY_STATS_ZONE( name ) TelemetryZone CCP_ANONYMOUS_VARIABLE( trinityZone_ )( TrinityTelemetryCategory(), name, __FILE__, __LINE__ ); +#define TRINITY_STATS_SCOPED_TIME( identifier ) \ + TelemetryZone CCP_ANONYMOUS_VARIABLE( trinitySopedTime_ )( TrinityTelemetryCategory(), g_ccpStatistics_##identifier.GetName().c_str(), __FILE__, __LINE__ ); \ + CcpStatisticsStopwatch ccpStatsStopwatch_##identifier( g_ccpStatistics_##identifier ) +#endif #endif \ No newline at end of file diff --git a/trinity/Tr2AtlasTexture.cpp b/trinity/Tr2AtlasTexture.cpp index f74ce9a6d..d1e6a9dcb 100644 --- a/trinity/Tr2AtlasTexture.cpp +++ b/trinity/Tr2AtlasTexture.cpp @@ -206,7 +206,7 @@ BlueAsyncRes::LoadingResult Tr2AtlasTexture::DoLoad() bool Tr2AtlasTexture::DoPrepare() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_textureAtlas ) { diff --git a/trinity/Tr2CurveLineSet.cpp b/trinity/Tr2CurveLineSet.cpp index 9325f8a8c..827033726 100644 --- a/trinity/Tr2CurveLineSet.cpp +++ b/trinity/Tr2CurveLineSet.cpp @@ -356,7 +356,7 @@ void Tr2CurveLineSet::WriteParticleVerticesToBuffer( // ------------------------------------------------------------------------------------------------------ bool Tr2CurveLineSet::FillVertexBuffer() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); diff --git a/trinity/Tr2DirectInstanceData.cpp b/trinity/Tr2DirectInstanceData.cpp index dd6355269..fd82b1175 100644 --- a/trinity/Tr2DirectInstanceData.cpp +++ b/trinity/Tr2DirectInstanceData.cpp @@ -210,7 +210,7 @@ void* Tr2DirectInstanceData::GetData( unsigned count ) // -------------------------------------------------------------------------------------- void Tr2DirectInstanceData::UpdateData() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_vertexBuffer.IsValid() ) { return; diff --git a/trinity/Tr2DxtCompressor.cpp b/trinity/Tr2DxtCompressor.cpp index 3627d88b8..365452662 100644 --- a/trinity/Tr2DxtCompressor.cpp +++ b/trinity/Tr2DxtCompressor.cpp @@ -838,7 +838,7 @@ bool Tr2DxtCompressSurface( Tr2DxtCompressionFormat eCompressFmt, volatile const bool& cancel, Tr2DxtCompressionSquishQuality squishQualityEnum ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); int squishQuality = squish::kColourRangeFit; diff --git a/trinity/Tr2DynamicRingBuffer.cpp b/trinity/Tr2DynamicRingBuffer.cpp index 36c6a28d8..e92e647c0 100644 --- a/trinity/Tr2DynamicRingBuffer.cpp +++ b/trinity/Tr2DynamicRingBuffer.cpp @@ -73,7 +73,7 @@ ALResult Tr2DynamicRingBuffer::PutData( if( !GetUnusedRegion( allocationSize, allocationOffset ) ) { - CCP_STATS_ZONE( "Tr2DynamicRingBuffer full buffer lock" ); + TRINITY_STATS_ZONE( "Tr2DynamicRingBuffer full buffer lock" ); allocationOffset = 0; RemoveRegions( m_regions.begin(), m_regions.end() ); if( m_bufferSize < allocationSize + m_sizeIncrement ) diff --git a/trinity/Tr2HostBitmap.cpp b/trinity/Tr2HostBitmap.cpp index 6150d91d7..e7a1a7464 100644 --- a/trinity/Tr2HostBitmap.cpp +++ b/trinity/Tr2HostBitmap.cpp @@ -444,7 +444,7 @@ bool Tr2HostBitmap::PopulateMargin( unsigned margin ) bool Tr2HostBitmap::Save( const wchar_t* path ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !IsValid() ) { diff --git a/trinity/Tr2ImageIOHelpers.cpp b/trinity/Tr2ImageIOHelpers.cpp index 23b75e805..d51f880d0 100644 --- a/trinity/Tr2ImageIOHelpers.cpp +++ b/trinity/Tr2ImageIOHelpers.cpp @@ -11,7 +11,7 @@ namespace bool CreateCubeTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& out, uint32_t& memoryUse, Tr2PrimaryRenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !bitmap.IsValid() ) { @@ -47,7 +47,7 @@ bool CreateCubeTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& out, uint32_t bool CreateVolumeTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& out, uint32_t& memoryUse, Tr2PrimaryRenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !bitmap.IsValid() ) { @@ -93,7 +93,7 @@ namespace Tr2ImageIOHelpers { bool Create2DTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& out, uint32_t& memoryUse, Tr2PrimaryRenderContext& renderContext, Tr2RenderContextEnum::BufferUsage usage ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !bitmap.IsValid() ) { @@ -147,7 +147,7 @@ bool CreateTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& out, uint32_t& me bool CopyToTexture( ImageIO::HostBitmap& bitmap, Tr2TextureAL& texture, unsigned int x, unsigned int y, unsigned int margin, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !bitmap.IsValid() ) { diff --git a/trinity/Tr2LightManager.cpp b/trinity/Tr2LightManager.cpp index ae20b7c3f..a1ee62bce 100644 --- a/trinity/Tr2LightManager.cpp +++ b/trinity/Tr2LightManager.cpp @@ -825,7 +825,7 @@ Tr2GpuResourcePool::Texture Tr2LightManager::RenderRaytracedShadows( { renderContext.AddGpuMarker( __FUNCTION__ ); GPU_REGION( renderContext, "Raytraced dynamic shadows" ); - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_shadowCastingLights.size() == 0 || !g_useDynamicLightsShadows ) { @@ -900,7 +900,7 @@ Tr2GpuResourcePool::Texture Tr2LightManager::RenderRaytracedShadows( } { - CCP_STATS_ZONE( "Create shader table" ); + TRINITY_STATS_ZONE( "Create shader table" ); Tr2RtLocalMaterialDescriptionAL material; material.SetConstants( 7, m_Raytracing.m_perFrameData ); @@ -916,7 +916,7 @@ Tr2GpuResourcePool::Texture Tr2LightManager::RenderRaytracedShadows( renderContext.UseAccelerationStructure( geometry->GetTLAS() ); { - CCP_STATS_ZONE( "renderContext.UseResources" ); + TRINITY_STATS_ZONE( "renderContext.UseResources" ); renderContext.UseResources( Tr2UseResourceDestination::COMPUTE, Tr2GpuUsage::SHADER_RESOURCE, geometry->GetBindlessResources() ); } diff --git a/trinity/Tr2MeshBase.cpp b/trinity/Tr2MeshBase.cpp index 1db1a252e..c1bace232 100644 --- a/trinity/Tr2MeshBase.cpp +++ b/trinity/Tr2MeshBase.cpp @@ -134,7 +134,7 @@ unsigned int Tr2MeshBase::FindJoint( const std::string* boneList, const int numB bool Tr2MeshBase::BindToRig( const std::string* boneList, const int numBones, TriGeometryResSkeletonData* renderRig, bool forceRebind ) { - CCP_STATS_ZONE( "Tr2Mesh::BindToRig" ); + TRINITY_STATS_ZONE( "Tr2Mesh::BindToRig" ); CCP_STATS_INC( tr2MeshBindToRig ); diff --git a/trinity/Tr2PickBuffer.cpp b/trinity/Tr2PickBuffer.cpp index c2d46f631..35ccaa563 100644 --- a/trinity/Tr2PickBuffer.cpp +++ b/trinity/Tr2PickBuffer.cpp @@ -78,7 +78,7 @@ bool Tr2PickBuffer::EndRendering( Tr2RenderContext& renderContext ) // ------------------------------------------------------------------------------------------------------ bool Tr2PickBuffer::MapForReading( bool synchronize, const void*& data, uint32_t& pitch, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_pickTarget.IsValid() ) { diff --git a/trinity/Tr2QuadRenderer.cpp b/trinity/Tr2QuadRenderer.cpp index da8046d9d..9cdf37eb5 100644 --- a/trinity/Tr2QuadRenderer.cpp +++ b/trinity/Tr2QuadRenderer.cpp @@ -131,7 +131,7 @@ void Tr2QuadRenderer::AddQuads( EffectKey effectKey, const void* sprites, size_t // -------------------------------------------------------------------------------------- uint32_t Tr2QuadRenderer::MergeBuffers() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Add padding to accomodate alignment for( auto& jt : m_effects ) @@ -177,7 +177,7 @@ uint32_t Tr2QuadRenderer::MergeBuffers() // -------------------------------------------------------------------------------------- void Tr2QuadRenderer::UpdateInstanceBuffer( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_bufferSize && !m_vertexBuffer.IsValid() ) { @@ -243,7 +243,7 @@ void Tr2QuadRenderer::RecreateQuadBuffers( uint32_t quadCount ) // -------------------------------------------------------------------------------------- void Tr2QuadRenderer::BeginRendering( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); uint32_t quadCount = MergeBuffers(); UpdateInstanceBuffer( renderContext ); diff --git a/trinity/Tr2RenderContext.cpp b/trinity/Tr2RenderContext.cpp index 49eef356d..02f83136f 100644 --- a/trinity/Tr2RenderContext.cpp +++ b/trinity/Tr2RenderContext.cpp @@ -33,7 +33,7 @@ Tr2EnumerableThreadSpecific s_perThreadUsedTextures; void UseTextures( ITriRenderBatchAccumulator* batches, const BlueSharedString& techniqueName, Tr2RenderContextAL& renderContext ) { #if TRINITY_PLATFORM_SUPPORTS_HEAP_VIEW - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Tr2BindlessResourcesAL usedTextures; usedTextures.Add( Tr2Renderer::GetFallbackTexture( Tr2EffectResource::TEXTURE_2D, "" ) ); @@ -74,7 +74,7 @@ void UseTextures( ITriRenderBatchAccumulator* batches, const BlueSharedString& t ProcessBatches( batches->GetGdprBatches() ); ProcessBatches( batches->GetBatches() ); { - CCP_STATS_ZONE( "renderContext.UseResources" ); + TRINITY_STATS_ZONE( "renderContext.UseResources" ); renderContext.UseResources( Tr2UseResourceDestination::RENDER, Tr2GpuUsage::SHADER_RESOURCE, usedTextures ); } #endif @@ -185,13 +185,13 @@ void Tr2RenderContext::PrepareParallelContext( uint32_t index, Tr2RenderContext& uint32_t Tr2RenderContext::BeginParallelEncoding( uint32_t count ) { #if TRINITY_PLATFORM_SUPPORTS_PARALLEL_CONTEXTS - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); CCP_ASSERT( m_parallelContextsPool.empty() ); uint32_t available = 0; { - CCP_STATS_ZONE( "Tr2RenderContextAL::BeginParallelEncoding" ); + TRINITY_STATS_ZONE( "Tr2RenderContextAL::BeginParallelEncoding" ); available = std::min( count, Tr2RenderContextAL::BeginParallelEncoding( count ) ); } if( available ) @@ -249,9 +249,9 @@ void Tr2RenderContext::Join( Tr2RenderContext* context ) void Tr2RenderContext::EndParallelEncoding() { #if TRINITY_PLATFORM_SUPPORTS_PARALLEL_CONTEXTS - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); { - CCP_STATS_ZONE( "Tr2RenderContextAL::EndParallelEncoding" ); + TRINITY_STATS_ZONE( "Tr2RenderContextAL::EndParallelEncoding" ); Tr2RenderContextAL::EndParallelEncoding(); } @@ -363,7 +363,7 @@ void Tr2RenderContextBase::RenderBatchesInOrder( ITriRenderBatchAccumulator* bat Tr2RenderContext* renderContext = reinterpret_cast( this ); - CCP_STATS_ZONE( "Direct drawing (sorted)" ); + TRINITY_STATS_ZONE( "Direct drawing (sorted)" ); #if TRINITY_PLATFORM != TRINITY_METAL GPU_REGION( *renderContext, "Direct drawing (sorted)" ); #endif @@ -405,7 +405,7 @@ void Tr2RenderContextBase::RenderBatchesInOrder( ITriRenderBatchAccumulator* bat } const char* effectPath = dynamic_cast( batch.m_material )->GetEffectPathName(); - CCP_STATS_ZONE( effectPath ); + TRINITY_STATS_ZONE( effectPath ); #if TRINITY_PLATFORM == TRINITY_DIRECTX12 GPU_REGION( *renderContext, effectPath ); @@ -483,7 +483,7 @@ void Tr2RenderContextBase::RenderBatchGroup( std::vector::const_ } const char* effectPath = dynamic_cast( startBatch->m_material )->GetEffectPathName(); - CCP_STATS_ZONE( effectPath ); + TRINITY_STATS_ZONE( effectPath ); #if TRINITY_PLATFORM == TRINITY_DIRECTX12 GPU_REGION( renderContext, effectPath ); #endif @@ -545,7 +545,7 @@ void Tr2RenderContextBase::RenderSortedBatches( const std::vector( this ); @@ -617,7 +617,7 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche #if TRINITY_PLATFORM == TRINITY_DIRECTX12 || TRINITY_PLATFORM == TRINITY_METAL if( g_gdrEnabled ) { - CCP_STATS_ZONE( "Indirect drawing" ); + TRINITY_STATS_ZONE( "Indirect drawing" ); #if TRINITY_PLATFORM != TRINITY_METAL GPU_REGION( *renderContext, "Indirect drawing" ); #endif @@ -650,7 +650,7 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche writers.reserve( gdprBatches.size() ); { - CCP_STATS_ZONE( "Prepare" ); + TRINITY_STATS_ZONE( "Prepare" ); uint32_t size = uint32_t( gdprBatches.size() ); uint32_t endIndex = 0; @@ -684,10 +684,10 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche } { - CCP_STATS_ZONE( "Record All" ); + TRINITY_STATS_ZONE( "Record All" ); auto RecordBin = [&]( Bin& bin ) { - CCP_STATS_ZONE( "Record" ); + TRINITY_STATS_ZONE( "Record" ); for( uint32_t k = bin.firstIndex; k < bin.endIndex; ++k ) { auto& batch = gdprBatches[k]; @@ -707,7 +707,7 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche s_buffer.CopyArguments(); { - CCP_STATS_ZONE( "Submit" ); + TRINITY_STATS_ZONE( "Submit" ); uint32_t drawCalls = 0; for( auto& bin : writers ) @@ -716,7 +716,7 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche auto& firstBatch = gdprBatches[bin.firstIndex]; const char* effectPath = dynamic_cast( firstBatch.m_material )->GetEffectPathName(); - CCP_STATS_ZONE( effectPath ); + TRINITY_STATS_ZONE( effectPath ); #if TRINITY_PLATFORM == TRINITY_DIRECTX12 GPU_REGION( *renderContext, effectPath ); #endif @@ -759,7 +759,7 @@ void Tr2RenderContextBase::RenderGdprBatches( ITriRenderBatchAccumulator* batche void Tr2RenderContextBase::RenderBatchesSortedByEffect( ITriRenderBatchAccumulator* batches, const BlueSharedString& techniqueName ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); D3DPERF_EVENT( L"Tr2EffectStateManager::RenderBatchesSortedByEffect" ); Tr2RenderContext* primaryContext = reinterpret_cast( this ); @@ -791,7 +791,7 @@ void Tr2RenderContextBase::RenderBatches( ITriRenderBatchAccumulator* batches, c void Tr2RenderContextBase::RenderBatchesWithOverride( ITriRenderBatchAccumulator* batches, Tr2Material* overrideEffect, const BlueSharedString& techniqueName ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !overrideEffect ) { @@ -867,7 +867,7 @@ void Tr2RenderContextBase::RenderBatchesWithOverride( ITriRenderBatchAccumulator void Tr2RenderContextBase::RenderBatchesForPicking( ITriRenderBatchAccumulator* batches, const BlueSharedString& techniqueName ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); D3DPERF_EVENT( L"Tr2EffectStateManager::RenderBatchesForPicking" ); Tr2RenderContext* primaryContext = reinterpret_cast( this ); diff --git a/trinity/Tr2RenderTarget.cpp b/trinity/Tr2RenderTarget.cpp index d3422a544..869a23a7e 100644 --- a/trinity/Tr2RenderTarget.cpp +++ b/trinity/Tr2RenderTarget.cpp @@ -83,7 +83,7 @@ int32_t Tr2RenderTarget::Create( Tr2RenderContextEnum::ExFlag flags, Tr2RenderContextEnum::TextureType type ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); if( IsAttached() ) { @@ -136,7 +136,7 @@ int32_t Tr2RenderTarget::CreateArray( Tr2RenderContextEnum::ExFlag flags, Tr2RenderContextEnum::TextureType type ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); if( IsAttached() ) { @@ -197,7 +197,7 @@ int32_t Tr2RenderTarget::CreateManual( Tr2CpuUsage::Type cpuUsage, Tr2GpuUsage::Type gpuUsage ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); if( IsAttached() ) { @@ -359,14 +359,14 @@ bool Tr2RenderTarget::IsReadable() const int32_t Tr2RenderTarget::GenerateMipMaps() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); return GetRenderTarget().GenerateMipMaps( renderContext ).GetResult(); } int32_t Tr2RenderTarget::Resolve( Tr2RenderTarget* destination ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); if( !destination ) { diff --git a/trinity/Tr2RuntimeInstanceData.cpp b/trinity/Tr2RuntimeInstanceData.cpp index fb7ede25f..53ac8e467 100644 --- a/trinity/Tr2RuntimeInstanceData.cpp +++ b/trinity/Tr2RuntimeInstanceData.cpp @@ -557,7 +557,7 @@ struct DeclarationMapping // -------------------------------------------------------------------------------------- void Tr2RuntimeInstanceData::Spawn() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( m_particleSystem && m_particleSystem->IsValid() && !m_layout.m_items.empty() && m_data ) diff --git a/trinity/Tr2SSSSS.cpp b/trinity/Tr2SSSSS.cpp index 23879a066..2b32ae355 100644 --- a/trinity/Tr2SSSSS.cpp +++ b/trinity/Tr2SSSSS.cpp @@ -65,7 +65,7 @@ Tr2SSSSS::Tr2SSSSS( IRoot* lockobj ) : void Tr2SSSSS::SetupScreenSpaceSubSurfaceScattering( Tr2RenderContext& renderContext, ITriRenderBatchAccumulator* batches, const Tr2TextureAL& colorMap, const Tr2TextureAL& opaqueColorMap, const Tr2TextureAL& depthMap, Tr2GpuResourcePool& gpuResourcePool ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_enabled ) { @@ -94,7 +94,7 @@ void Tr2SSSSS::SetupScreenSpaceSubSurfaceScattering( Tr2RenderContext& renderCon // JKG need to confirm m_primaryBatches is a safe batch to render from { - CCP_STATS_ZONE( "SeprableSpecularRendering" ); + TRINITY_STATS_ZONE( "SeprableSpecularRendering" ); renderContext.m_esm.ApplyStandardStates( Tr2EffectStateManager::RM_OPAQUE ); renderContext.RenderBatches( batches, SSSSS ); diff --git a/trinity/Tr2ShLightingManager.cpp b/trinity/Tr2ShLightingManager.cpp index e8c7dba01..9a7e6e332 100644 --- a/trinity/Tr2ShLightingManager.cpp +++ b/trinity/Tr2ShLightingManager.cpp @@ -287,7 +287,7 @@ void Tr2ShLightingManager::UnregisterSecondaryLightSource( const Vector3* positi // -------------------------------------------------------------------------------------- void Tr2ShLightingManager::UpdateWithDirectionalLight( const Vector3& direction, const Vector3& color ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_sunColor = color; m_sunDirection = Normalize( direction ); @@ -393,7 +393,7 @@ inline float MaxVectorComponent( const Vector3& v ) // -------------------------------------------------------------------------------------- void Tr2ShLightingManager::UpdateSourceData() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_sourceCount = 0; size_t dataSize = sizeof( SourceData ) * ( ( m_sources.size() + m_lights.size() + 3 ) / 4 ) * 4; diff --git a/trinity/Tr2ShadowMap.cpp b/trinity/Tr2ShadowMap.cpp index 9042b1d02..e72a523c4 100644 --- a/trinity/Tr2ShadowMap.cpp +++ b/trinity/Tr2ShadowMap.cpp @@ -143,7 +143,7 @@ AxisAlignedBoundingBox Tr2ShadowMap::CalculateAABB( Matrix projection, Matrix in // -------------------------------------------------------------------------------- ShadowMap::SplitSetup Tr2ShadowMap::SetupShadowSplit( int splitIndex, Matrix invViewTransform, const Vector3 lightDirection, float zNear, float leftDivNear, float rightDivNear, float topDivNear, float bottomDivNear ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); ShadowMap::SplitSetup splitSetup; @@ -225,7 +225,7 @@ ShadowMap::SplitSetup Tr2ShadowMap::SetupShadowSplit( int splitIndex, Matrix inv Tr2GpuResourcePool::Texture Tr2ShadowMap::PrepareShadowRendering( Tr2GpuResourcePool& gpuResourcePool, Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto cascadedShadowDepth = gpuResourcePool.GetTempTexture( "cascadedShadowDepth", m_size * m_width, m_size * m_height, PixelFormat::PIXEL_FORMAT_D32_FLOAT, Tr2GpuUsage::DEPTH_STENCIL | Tr2GpuUsage::SHADER_RESOURCE ); @@ -252,7 +252,7 @@ Tr2GpuResourcePool::Texture Tr2ShadowMap::PrepareShadowRendering( Tr2GpuResource void Tr2ShadowMap::BeginShadowRendering( Tr2RenderContext& renderContext, int splitIndex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( splitIndex < 8 ) { @@ -266,7 +266,7 @@ void Tr2ShadowMap::BeginShadowRendering( Tr2RenderContext& renderContext, int sp void Tr2ShadowMap::EndShadowRendering( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); renderContext.SetReadOnlyDepth( false ); //***** End shadow rendering *****// @@ -277,7 +277,7 @@ void Tr2ShadowMap::EndShadowRendering( Tr2RenderContext& renderContext ) Tr2GpuResourcePool::Texture Tr2ShadowMap::DrawToShadowMapResult( Tr2RenderContext& renderContext, Tr2GpuResourcePool& gpuResourcePool, const Tr2TextureAL& depthMap, const Tr2TextureAL& cascadedShadowDepth, float upscaling ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto shadowMapResult = gpuResourcePool.GetTempTexture( "shadowMapResult", depthMap.GetWidth(), depthMap.GetHeight(), PixelFormat::PIXEL_FORMAT_R8_UNORM, Tr2GpuUsage::RENDER_TARGET | Tr2GpuUsage::SHADER_RESOURCE ); @@ -292,7 +292,7 @@ Tr2GpuResourcePool::Texture Tr2ShadowMap::DrawToShadowMapResult( Tr2RenderContex m_shadowEffect->SetParameter( BlueSharedString( "DepthMap" ), Tr2TextureAL{} ); { - CCP_STATS_ZONE( "DO_DENOISER" ); + TRINITY_STATS_ZONE( "DO_DENOISER" ); if( m_denoiser && m_useDenoiser && depthMap.IsValid() ) { shadowMapResult = m_denoiser->Apply( std::move( shadowMapResult ), depthMap, {}, Tr2Renderer::GetReversedDepthProjectionTransform(), upscaling, gpuResourcePool, renderContext ); diff --git a/trinity/Tr2SkinnedObject.cpp b/trinity/Tr2SkinnedObject.cpp index fbcd22e4f..967539b2b 100644 --- a/trinity/Tr2SkinnedObject.cpp +++ b/trinity/Tr2SkinnedObject.cpp @@ -59,7 +59,7 @@ Tr2SkinnedObject::~Tr2SkinnedObject() void Tr2SkinnedObject::PrePhysicsUpdate( Be::Time time ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const Be::Time deltaTime = time - m_lastUpdateTime; if( TimeAsFloat( deltaTime ) < m_updatePeriod ) @@ -82,7 +82,7 @@ void Tr2SkinnedObject::PrePhysicsUpdate( Be::Time time ) void Tr2SkinnedObject::PostPhysicsUpdate( Be::Time time, Tr2ApexScene* apexScene ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const Be::Time deltaTime = time - m_lastUpdateTime; if( TimeAsFloat( deltaTime ) < m_updatePeriod ) @@ -129,7 +129,7 @@ void Tr2SkinnedObject::PostPhysicsUpdate( Be::Time time, Tr2ApexScene* apexScene void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_hasDynamicBounds = false; @@ -157,7 +157,7 @@ void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) if( boneList == NULL && skel != NULL ) { - CCP_STATS_ZONE( "UpdateBones_BuildRenderRigBoneList" ); + TRINITY_STATS_ZONE( "UpdateBones_BuildRenderRigBoneList" ); // Either the animationUpdater is NULL or it hasn't been set up fully yet, // so create a new boneList based off the render rig. This allows rendering @@ -204,7 +204,7 @@ void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) if( rebuildMapping && skel != NULL ) { - CCP_STATS_ZONE( "UpdateBones_RebuildMapping" ); + TRINITY_STATS_ZONE( "UpdateBones_RebuildMapping" ); ++m_skeletonTag; @@ -235,7 +235,7 @@ void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) if( skel != NULL ) { - CCP_STATS_ZONE( "UpdateBones_MatrixUpdate" ); + TRINITY_STATS_ZONE( "UpdateBones_MatrixUpdate" ); ++m_skinningMatrixQueueIndex; m_skinningMatrixQueueIndex %= m_skinningMatrixQueue.size(); @@ -244,7 +244,7 @@ void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) if( m_animationUpdater != NULL ) { - CCP_STATS_ZONE( "UpdateBones_AnimationUpdate" ); + TRINITY_STATS_ZONE( "UpdateBones_AnimationUpdate" ); accumulatedTransforms = m_animationUpdater->GetAnimationTransforms(); @@ -314,7 +314,7 @@ void Tr2SkinnedObject::UpdateBones( Be::Time time, Tr2ApexScene* apexScene ) if( m_skinningMatrixQueueNeedsPriming ) { - CCP_STATS_ZONE( "UpdateBones_Priming" ); + TRINITY_STATS_ZONE( "UpdateBones_Priming" ); // Starting at 0 as m_skinningMatrixQueueIndex has already been incremented unsigned int n = (unsigned int)m_skinningMatrixQueue.size() - 1; diff --git a/trinity/Tr2SkinnedObjectLOD.cpp b/trinity/Tr2SkinnedObjectLOD.cpp index e8c7d787c..8ee5fd63a 100644 --- a/trinity/Tr2SkinnedObjectLOD.cpp +++ b/trinity/Tr2SkinnedObjectLOD.cpp @@ -196,7 +196,7 @@ void Tr2SkinnedObjectLod::SetLowDetailModel( Tr2SkinnedModel* model ) Tr2SkinnedModel* Tr2SkinnedObjectLod::SetLOD( const TriFrustum* frustum, float estimatedPixelDiameter ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_allowLodSelection ) { diff --git a/trinity/Tr2TextureAnimation.cpp b/trinity/Tr2TextureAnimation.cpp index 1f4f347c1..7e1c102a1 100644 --- a/trinity/Tr2TextureAnimation.cpp +++ b/trinity/Tr2TextureAnimation.cpp @@ -200,7 +200,7 @@ void Tr2TextureAnimation::AdvanceTime( float dt ) m_time += dt * m_fps; if( m_time > 1 && m_asyncState->bitmapsReady ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); ++m_frame; if( m_frame >= m_asyncState->reader.GetFrameCount() ) @@ -226,7 +226,7 @@ void Tr2TextureAnimation::UpdateGrids() for( size_t i = 0; i < m_grids.size(); ++i ) { - CCP_STATS_ZONE( "UpdateSubresource" ); + TRINITY_STATS_ZONE( "UpdateSubresource" ); auto& bitmap = m_asyncState->decoders[i].GetFrameBitmap(); m_grids[i].frame.UpdateSubresource( Tr2TextureSubresource( 0 ), bitmap.GetRawData(), bitmap.GetPitch(), bitmap.GetPitch() * bitmap.GetHeight(), renderContext ); } @@ -296,7 +296,7 @@ Tr2TextureAnimation::AsyncRequest* Tr2TextureAnimation::MakeRequest() void Tr2TextureAnimation::ReadFile( void* ctx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto request = static_cast( ctx ); IBlueStreamPtr stream; @@ -340,7 +340,7 @@ void Tr2TextureAnimation::ReadFile( void* ctx ) void Tr2TextureAnimation::DecodeFirstFrame( void* ctx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto request = static_cast( ctx ); for( uint32_t i = 0; i < request->state->reader.GetGridCount(); ++i ) @@ -358,7 +358,7 @@ void Tr2TextureAnimation::DecodeFirstFrame( void* ctx ) void Tr2TextureAnimation::DecodeNextFrame( void* ctx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto request = static_cast( ctx ); for( auto& decoder : request->state->decoders ) @@ -376,7 +376,7 @@ void Tr2TextureAnimation::DecodeNextFrame( void* ctx ) void Tr2TextureAnimation::RestartAndDecodeFrame( void* ctx ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); auto request = static_cast( ctx ); for( auto& decoder : request->state->decoders ) diff --git a/trinity/Tr2TextureAtlas.cpp b/trinity/Tr2TextureAtlas.cpp index 9e89c9576..3ffa65f9a 100644 --- a/trinity/Tr2TextureAtlas.cpp +++ b/trinity/Tr2TextureAtlas.cpp @@ -130,7 +130,7 @@ bool Tr2TextureAtlas::OnPrepareResources() // This gets called when atlas textures are preparing themselves bool Tr2TextureAtlas::DoPrepare( Tr2AtlasTexture* tex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -222,7 +222,7 @@ void Tr2TextureAtlas::RemoveFromAtlas( Tr2AtlasTexture* tex ) //to improve further usage. void Tr2TextureAtlas::ConsolidateFreeAreas() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); ReleasePendingFreeAreas(); @@ -485,7 +485,7 @@ class FreeAreasTopToBottom void Tr2TextureAtlas::CollapseFreeAreas() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); ReleasePendingFreeAreas(); @@ -687,7 +687,7 @@ bool Tr2TextureAtlas::CollapseAreas( Tr2TextureAtlasArea* area1, Tr2TextureAtlas Tr2TextureAtlasArea* Tr2TextureAtlas::GetFreeArea( unsigned int width, unsigned int height ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // Check if the largest free area we have is smaller than requested if( IsLargeTexture( width, height ) ) @@ -1035,7 +1035,7 @@ void Tr2TextureAtlas::PullInOutsiders( bool optimiseInsertion ) bool Tr2TextureAtlas::CopyTextureIntoAtlas( Tr2AtlasTexture* tex ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -1448,7 +1448,7 @@ bool Tr2TextureAtlas::IsLargeTexture( unsigned int width, unsigned int height ) //Call this manually to update mipmaps when appropriate void Tr2TextureAtlas::UpdateMipMaps( Tr2RenderContext& renderContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !m_hasMipMaps || m_dirtyMipRegions.empty() ) { diff --git a/trinity/Tr2VariableStore.cpp b/trinity/Tr2VariableStore.cpp index 7d9d741be..97d0d9530 100644 --- a/trinity/Tr2VariableStore.cpp +++ b/trinity/Tr2VariableStore.cpp @@ -292,7 +292,7 @@ bool Tr2VariableStore::UnregisterLocalVariable( const char* name ) // ------------------------------------------------------------- TriVariable* Tr2VariableStore::FindVariable( const char* name ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); const Tr2VariableStore* store = this; while( store ) diff --git a/trinity/Tr2VolumetricsRenderer.cpp b/trinity/Tr2VolumetricsRenderer.cpp index 064451f31..708c5b3ac 100644 --- a/trinity/Tr2VolumetricsRenderer.cpp +++ b/trinity/Tr2VolumetricsRenderer.cpp @@ -191,7 +191,7 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderVolumetrics( return GetEmptyVolumetricTexture( gpuResourcePool ); } - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); renderContext.AddGpuMarker( __FUNCTION__ ); GPU_REGION( renderContext, "Volumetrics" ); @@ -716,7 +716,7 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderFog( Tr2RtLocalMaterialDescriptionAL material; material.SetConstants( Tr2Renderer::GetPerObjectVSStartRegister(), m_fogConstantBuffer ); - CCP_STATS_ZONE( "Create shader table" ); + TRINITY_STATS_ZONE( "Create shader table" ); m_shaderTableDesc.AddRayGenShader( rayGenName.c_str(), material ); m_shaderTableDesc.AddMissShader( missName.c_str(), material ); @@ -734,7 +734,7 @@ Tr2GpuResourcePool::Texture Tr2VolumetricsRenderer::RenderFog( renderContext.UseAccelerationStructure( raytracingGeometry->GetTLAS() ); { - CCP_STATS_ZONE( "renderContext.UseResources" ); + TRINITY_STATS_ZONE( "renderContext.UseResources" ); renderContext.UseResources( Tr2UseResourceDestination::COMPUTE, Tr2GpuUsage::SHADER_RESOURCE, raytracingGeometry->GetBindlessResources() ); } diff --git a/trinity/TriDevice.cpp b/trinity/TriDevice.cpp index 76e3c3efe..37fd052a4 100644 --- a/trinity/TriDevice.cpp +++ b/trinity/TriDevice.cpp @@ -696,7 +696,7 @@ static const float ANIMATION_TIME_MAX = 3600.0f; // One hour void TriDevice::OnTick( Be::Time realTime, Be::Time simTime, void* cookie ) { - CCP_STATS_SCOPED_TIME( deviceOnTick ); + TRINITY_STATS_SCOPED_TIME( deviceOnTick ); // Start with statistics on frame time static BeTimer s_frameTimer; @@ -1250,7 +1250,7 @@ void TriDevice::Throttle() const if( sleepTime > 0 ) { - CCP_STATS_SCOPED_TIME( throttleTime ); + TRINITY_STATS_SCOPED_TIME( throttleTime ); CcpThreadSleep( sleepTime ); } @@ -1353,7 +1353,7 @@ void TriDevice::SetUpscaling( Tr2UpscalingAL::Technique technique, Tr2UpscalingA uint32_t TriDevice::CreateUpscalingContext( uint32_t displayWidth, uint32_t displayHeight, Tr2RenderContextEnum::PixelFormat sourceFormat, Tr2RenderContextEnum::DepthStencilFormat depthFormat, bool allowFramegen, Be::Optional existingContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); @@ -1374,7 +1374,7 @@ uint32_t TriDevice::CreateUpscalingContext( uint32_t displayWidth, uint32_t disp void TriDevice::DeleteUpscalingContext( uint32_t contextID ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); renderContext.DeleteUpscalingContext( contextID ); } diff --git a/trinity/TriDevice11.cpp b/trinity/TriDevice11.cpp index 6c4026d62..535946356 100644 --- a/trinity/TriDevice11.cpp +++ b/trinity/TriDevice11.cpp @@ -137,7 +137,7 @@ void TriDevice::HandleRenderTick( Be::Time realTime, Be::Time simTime ) // acyncrounicy between EndScene() and Present(). So if we pump Python // and do all the other stuff between we get a degree of paralization { - CCP_STATS_SCOPED_TIME( presentTime ); + TRINITY_STATS_SCOPED_TIME( presentTime ); CR_RETURN( Tr2RenderContext_GetMainThreadRenderContext().Present() ); } @@ -169,7 +169,7 @@ bool TriDevice::DeviceExists() // -------------------------------------------------------------------------------------- void TriDevice::ApplicationActivated( ApplicationActivation activated ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !mPresentParam.windowed && mHwnd ) { diff --git a/trinity/TriDevice12.cpp b/trinity/TriDevice12.cpp index cded55596..e060bd8e8 100644 --- a/trinity/TriDevice12.cpp +++ b/trinity/TriDevice12.cpp @@ -336,7 +336,7 @@ void TriDevice::HandleRenderTick( Be::Time realTime, Be::Time simTime ) // and do all the other stuff between we get a degree of paralization Tr2RenderContext_GetMainThreadRenderContext().MarkFrameEvent( Tr2RenderContextEnum::FRAME_EVENT_PRESENT_STARTED ); { - CCP_STATS_SCOPED_TIME( presentTime ); + TRINITY_STATS_SCOPED_TIME( presentTime ); if( FAILED( Tr2RenderContext_GetMainThreadRenderContext().Present() ) ) { if( HandleLostDevice() ) @@ -380,7 +380,7 @@ bool TriDevice::DeviceExists() // -------------------------------------------------------------------------------------- void TriDevice::ApplicationActivated( ApplicationActivation activated ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); if( !mPresentParam.windowed && mHwnd ) { diff --git a/trinity/TriDeviceMetal.cpp b/trinity/TriDeviceMetal.cpp index 7e1c884ef..465a20f01 100644 --- a/trinity/TriDeviceMetal.cpp +++ b/trinity/TriDeviceMetal.cpp @@ -52,7 +52,7 @@ void TriDevice::HandleRenderTick( Be::Time realTime, Be::Time simTime ) { Tr2RenderContext_GetMainThreadRenderContext().MarkFrameEvent( Tr2RenderContextEnum::FRAME_EVENT_PRESENT_STARTED ); - CCP_STATS_SCOPED_TIME( presentTime ); + TRINITY_STATS_SCOPED_TIME( presentTime ); CR_RETURN( renderContext.Present() ); Tr2RenderContext_GetMainThreadRenderContext().MarkFrameEvent( Tr2RenderContextEnum::FRAME_EVENT_PRESENT_FINISHED ); } diff --git a/trinity/UI/Tr2MainWindow_Windows.cpp b/trinity/UI/Tr2MainWindow_Windows.cpp index e4165cf1b..77e8740d0 100644 --- a/trinity/UI/Tr2MainWindow_Windows.cpp +++ b/trinity/UI/Tr2MainWindow_Windows.cpp @@ -360,7 +360,7 @@ bool Tr2MainWindow::ProcessMessages() LRESULT Tr2MainWindow::StaticWndProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); Tr2MainWindow* window = nullptr; if( msg == WM_CREATE ) diff --git a/trinity/trinity.cpp b/trinity/trinity.cpp index 8e0380eb6..88aa255f5 100644 --- a/trinity/trinity.cpp +++ b/trinity/trinity.cpp @@ -75,6 +75,17 @@ void Tr2GrannyDeallocate( const char* file, granny_int32x line, void* memory ) } #endif +#ifndef PYTHON2_SUPPORT + +const CcpTelemetryCategory& TrinityTelemetryCategory() +{ + static const CcpTelemetryCategory& category = + CcpTelemetryCategoryRegister( "trinity", CcpColor::PowderBlue ).first; + return category; +} + +#endif + #if BLUE_WITH_PYTHON #if PY_MAJOR_VERSION == 2 From 8c775922a30d6d83c957df00663699945b6d860a Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Wed, 16 Sep 2026 11:23:29 +0000 Subject: [PATCH 8/8] Formatting --- trinity/StdAfx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trinity/StdAfx.h b/trinity/StdAfx.h index 95e2cf7ed..cc0d6cdfe 100644 --- a/trinity/StdAfx.h +++ b/trinity/StdAfx.h @@ -156,7 +156,7 @@ using std::max; const CcpTelemetryCategory& TrinityTelemetryCategory(); #define TRINITY_STATS_ZONE( name ) TelemetryZone CCP_ANONYMOUS_VARIABLE( trinityZone_ )( TrinityTelemetryCategory(), name, __FILE__, __LINE__ ); -#define TRINITY_STATS_SCOPED_TIME( identifier ) \ +#define TRINITY_STATS_SCOPED_TIME( identifier ) \ TelemetryZone CCP_ANONYMOUS_VARIABLE( trinitySopedTime_ )( TrinityTelemetryCategory(), g_ccpStatistics_##identifier.GetName().c_str(), __FILE__, __LINE__ ); \ CcpStatisticsStopwatch ccpStatsStopwatch_##identifier( g_ccpStatistics_##identifier )