Add Tracy instrumentation for CPU and GPU in OpenGL mode. (#2417)
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#include <mbgl/renderer/layers/render_line_layer.hpp>
|
||||
#include <mbgl/renderer/layers/render_symbol_layer.hpp>
|
||||
#include <mbgl/renderer/buckets/symbol_bucket.hpp>
|
||||
#include <mbgl/util/instrumentation.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/util/constants.hpp>
|
||||
#include <mbgl/util/string.hpp>
|
||||
@@ -46,6 +47,8 @@ GeometryTileWorker::GeometryTileWorker(ActorRef<GeometryTileWorker> self_,
|
||||
showCollisionBoxes(showCollisionBoxes_) {}
|
||||
|
||||
GeometryTileWorker::~GeometryTileWorker() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
Scheduler::GetBackground()->runOnRenderThread([renderData_{std::move(renderData)}]() {});
|
||||
}
|
||||
|
||||
@@ -123,6 +126,8 @@ GeometryTileWorker::~GeometryTileWorker() {
|
||||
void GeometryTileWorker::setData(std::unique_ptr<const GeometryTileData> data_,
|
||||
std::set<std::string> availableImages_,
|
||||
uint64_t correlationID_) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
try {
|
||||
data = std::move(data_);
|
||||
correlationID = correlationID_;
|
||||
@@ -148,6 +153,8 @@ void GeometryTileWorker::setData(std::unique_ptr<const GeometryTileData> data_,
|
||||
void GeometryTileWorker::setLayers(std::vector<Immutable<LayerProperties>> layers_,
|
||||
std::set<std::string> availableImages_,
|
||||
uint64_t correlationID_) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
try {
|
||||
layers = std::move(layers_);
|
||||
correlationID = correlationID_;
|
||||
@@ -189,6 +196,8 @@ void GeometryTileWorker::reset(uint64_t correlationID_) {
|
||||
}
|
||||
|
||||
void GeometryTileWorker::setShowCollisionBoxes(bool showCollisionBoxes_, uint64_t correlationID_) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
try {
|
||||
showCollisionBoxes = showCollisionBoxes_;
|
||||
correlationID = correlationID_;
|
||||
@@ -217,6 +226,8 @@ void GeometryTileWorker::setShowCollisionBoxes(bool showCollisionBoxes_, uint64_
|
||||
}
|
||||
|
||||
void GeometryTileWorker::symbolDependenciesChanged() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
try {
|
||||
switch (state) {
|
||||
case Idle:
|
||||
@@ -245,6 +256,8 @@ void GeometryTileWorker::symbolDependenciesChanged() {
|
||||
}
|
||||
|
||||
void GeometryTileWorker::coalesced() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
try {
|
||||
switch (state) {
|
||||
case Idle:
|
||||
@@ -274,11 +287,15 @@ void GeometryTileWorker::coalesced() {
|
||||
}
|
||||
|
||||
void GeometryTileWorker::coalesce() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
state = Coalescing;
|
||||
self.invoke(&GeometryTileWorker::coalesced);
|
||||
}
|
||||
|
||||
void GeometryTileWorker::onGlyphsAvailable(GlyphMap newGlyphMap) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
for (auto& newFontGlyphs : newGlyphMap) {
|
||||
FontStackHash fontStack = newFontGlyphs.first;
|
||||
Glyphs& newGlyphs = newFontGlyphs.second;
|
||||
@@ -308,6 +325,8 @@ void GeometryTileWorker::onImagesAvailable(ImageMap newIconMap,
|
||||
ImageMap newPatternMap,
|
||||
ImageVersionMap newVersionMap,
|
||||
uint64_t imageCorrelationID_) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
if (imageCorrelationID != imageCorrelationID_) {
|
||||
return; // Ignore outdated image request replies.
|
||||
}
|
||||
@@ -319,6 +338,8 @@ void GeometryTileWorker::onImagesAvailable(ImageMap newIconMap,
|
||||
}
|
||||
|
||||
void GeometryTileWorker::requestNewGlyphs(const GlyphDependencies& glyphDependencies) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
for (auto& fontDependencies : glyphDependencies) {
|
||||
auto fontGlyphs = glyphMap.find(FontStackHasher()(fontDependencies.first));
|
||||
for (auto glyphID : fontDependencies.second) {
|
||||
@@ -333,6 +354,8 @@ void GeometryTileWorker::requestNewGlyphs(const GlyphDependencies& glyphDependen
|
||||
}
|
||||
|
||||
void GeometryTileWorker::requestNewImages(const ImageDependencies& imageDependencies) {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
pendingImageDependencies = imageDependencies;
|
||||
|
||||
if (!pendingImageDependencies.empty()) {
|
||||
@@ -341,6 +364,8 @@ void GeometryTileWorker::requestNewImages(const ImageDependencies& imageDependen
|
||||
}
|
||||
|
||||
void GeometryTileWorker::parse() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
if (!data || !layers) {
|
||||
return;
|
||||
}
|
||||
@@ -462,6 +487,8 @@ bool GeometryTileWorker::hasPendingParseResult() const {
|
||||
}
|
||||
|
||||
void GeometryTileWorker::finalizeLayout() {
|
||||
MLN_TRACE_FUNC();
|
||||
|
||||
if (!data || !layers || !hasPendingParseResult() || hasPendingDependencies()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user