Third-party libraries tracy use the original git address; Change the …

…trace_ macro to tracy_

DEPS

@@ -66,7 +66,7 @@
         "dir": "third_party/expat"
       },
       {
-        "url": "${PAG_GROUP}/tracy.git",
+        "url": "https://github.com/wolfpld/tracy.git",
         "commit": "759b4c3bfe207ab382c01080f0417aca5af4411a",
         "dir": "third_party/tracy"
       }

src/core/Canvas.cpp

@@ -167,7 +167,7 @@ static FillStyle CreateFillStyle(const Paint* paint) {
 }
 
 void Canvas::drawLine(float x0, float y0, float x1, float y1, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawLine");
+  TRACY_ZONE_SCOPED_N("Canvas::drawLine");
   Path path = {};
   path.moveTo(x0, y0);
   path.lineTo(x1, y1);
@@ -177,7 +177,7 @@ void Canvas::drawLine(float x0, float y0, float x1, float y1, const Paint& paint
 }
 
 void Canvas::drawRect(const Rect& rect, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawRect");
+  TRACY_ZONE_SCOPED_N("Canvas::drawRect");
   if (paint.getStroke()) {
     Path path = {};
     path.addRect(rect);
@@ -192,28 +192,28 @@ void Canvas::drawRect(const Rect& rect, const Paint& paint) {
 }
 
 void Canvas::drawOval(const Rect& oval, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawOval");
+  TRACY_ZONE_SCOPED_N("Canvas::drawOval");
   RRect rRect = {};
   rRect.setOval(oval);
   drawRRect(rRect, paint);
 }
 
 void Canvas::drawCircle(float centerX, float centerY, float radius, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawCircle");
+  TRACY_ZONE_SCOPED_N("Canvas::drawCircle");
   Rect rect =
       Rect::MakeLTRB(centerX - radius, centerY - radius, centerX + radius, centerY + radius);
   drawOval(rect, paint);
 }
 
 void Canvas::drawRoundRect(const Rect& rect, float radiusX, float radiusY, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawRoundRect");
+  TRACY_ZONE_SCOPED_N("Canvas::drawRoundRect");
   RRect rRect = {};
   rRect.setRectXY(rect, radiusX, radiusY);
   drawRRect(rRect, paint);
 }
 
 void Canvas::drawRRect(const RRect& rRect, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawRRect");
+  TRACY_ZONE_SCOPED_N("Canvas::drawRRect");
   if (rRect.radii.isZero()) {
     drawRect(rRect.rect, paint);
     return;
@@ -232,13 +232,13 @@ void Canvas::drawRRect(const RRect& rRect, const Paint& paint) {
 }
 
 void Canvas::drawPath(const Path& path, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawPath");
+  TRACY_ZONE_SCOPED_N("Canvas::drawPath");
   auto shape = Shape::MakeFrom(path);
   drawShape(std::move(shape), paint);
 }
 
 void Canvas::drawShape(std::shared_ptr<Shape> shape, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawShape");
+  TRACY_ZONE_SCOPED_N("Canvas::drawShape");
   if (shape == nullptr || paint.nothingToDraw()) {
     return;
   }
@@ -295,7 +295,7 @@ void Canvas::drawImage(std::shared_ptr<Image> image, const SamplingOptions& samp
 
 void Canvas::drawImage(std::shared_ptr<Image> image, const SamplingOptions& sampling,
                        const Paint* paint, const Matrix* extraMatrix) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawImage");
+  TRACY_ZONE_SCOPED_N("Canvas::drawImage");
   if (image == nullptr || (paint && paint->nothingToDraw())) {
     return;
   }
@@ -319,7 +319,7 @@ void Canvas::drawImage(std::shared_ptr<Image> image, const SamplingOptions& samp
 
 void Canvas::drawSimpleText(const std::string& text, float x, float y, const Font& font,
                             const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawSimpleText");
+  TRACY_ZONE_SCOPED_N("Canvas::drawSimpleText");
   if (text.empty()) {
     return;
   }
@@ -329,7 +329,7 @@ void Canvas::drawSimpleText(const std::string& text, float x, float y, const Fon
 
 void Canvas::drawGlyphs(const GlyphID glyphs[], const Point positions[], size_t glyphCount,
                         const Font& font, const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawGlyphs");
+  TRACY_ZONE_SCOPED_N("Canvas::drawGlyphs");
   if (glyphCount == 0 || paint.nothingToDraw()) {
     return;
   }
@@ -341,7 +341,7 @@ void Canvas::drawGlyphs(const GlyphID glyphs[], const Point positions[], size_t
 
 void Canvas::drawTextBlob(std::shared_ptr<TextBlob> textBlob, float x, float y,
                           const Paint& paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawTextBlob");
+  TRACY_ZONE_SCOPED_N("Canvas::drawTextBlob");
   if (textBlob == nullptr || paint.nothingToDraw()) {
     return;
   }
@@ -354,13 +354,13 @@ void Canvas::drawTextBlob(std::shared_ptr<TextBlob> textBlob, float x, float y,
 }
 
 void Canvas::drawPicture(std::shared_ptr<Picture> picture) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawPicture");
+  TRACY_ZONE_SCOPED_N("Canvas::drawPicture");
   drawContext->drawPicture(std::move(picture), *mcState);
 }
 
 void Canvas::drawPicture(std::shared_ptr<Picture> picture, const Matrix* matrix,
                          const Paint* paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawPictureWithMatrix");
+  TRACY_ZONE_SCOPED_N("Canvas::drawPictureWithMatrix");
   if (picture == nullptr) {
     return;
   }
@@ -378,7 +378,7 @@ void Canvas::drawPicture(std::shared_ptr<Picture> picture, const Matrix* matrix,
 
 void Canvas::drawLayer(std::shared_ptr<Picture> picture, const MCState& state,
                        const FillStyle& style, std::shared_ptr<ImageFilter> imageFilter) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawLayer");
+  TRACY_ZONE_SCOPED_N("Canvas::drawLayer");
   if (imageFilter == nullptr && picture->records.size() == 1 && style.maskFilter == nullptr) {
     LayerUnrollContext layerContext(drawContext, style);
     picture->playback(&layerContext, state);
@@ -392,7 +392,7 @@ void Canvas::drawLayer(std::shared_ptr<Picture> picture, const MCState& state,
 void Canvas::drawAtlas(std::shared_ptr<Image> atlas, const Matrix matrix[], const Rect tex[],
                        const Color colors[], size_t count, const SamplingOptions& sampling,
                        const Paint* paint) {
-  TRACE_ZONE_SCOPED_N("Canvas::drawAtlas");
+  TRACY_ZONE_SCOPED_N("Canvas::drawAtlas");
   // TODO: Support blend mode, atlas as source, colors as destination, colors can be nullptr.
   if (atlas == nullptr || count == 0 || (paint && paint->nothingToDraw())) {
     return;

src/core/DataProvider.cpp

@@ -26,7 +26,7 @@ class DataWrapper : public DataProvider {
   }
 
   std::shared_ptr<Data> getData() const override {
-    TRACE_ZONE_SCOPED_N("DataWrapper::getData");
+    TRACY_ZONE_SCOPED_N("DataWrapper::getData");
     return data;
   }
 

src/core/GlyphRasterizer.cpp

@@ -35,7 +35,7 @@ GlyphRasterizer::~GlyphRasterizer() {
 }
 
 std::shared_ptr<ImageBuffer> GlyphRasterizer::onMakeBuffer(bool tryHardware) const {
-  TRACE_ZONE_SCOPED_N("GlyphRasterizer::onMakeBuffer");
+  TRACY_ZONE_SCOPED_N("GlyphRasterizer::onMakeBuffer");
   auto mask = Mask::Make(width(), height(), tryHardware);
   if (!mask) {
     return nullptr;

src/core/ImageCodec.cpp

@@ -41,7 +41,7 @@
 
 namespace tgfx {
 std::shared_ptr<ImageCodec> ImageCodec::MakeFrom(const std::string& filePath) {
-  TRACE_ZONE_SCOPED_N("ImageCodec::MakeFrom");
+  TRACY_ZONE_SCOPED_N("ImageCodec::MakeFrom");
   std::shared_ptr<ImageCodec> codec = nullptr;
   auto stream = Stream::MakeFromFile(filePath);
   if (stream == nullptr || stream->size() <= 14) {
@@ -137,7 +137,7 @@ std::shared_ptr<Data> ImageCodec::Encode(const Pixmap& pixmap, EncodedFormat for
 }
 
 std::shared_ptr<ImageBuffer> ImageCodec::onMakeBuffer(bool tryHardware) const {
-  TRACE_ZONE_SCOPED_N("ImageCodec::onMakeBuffer");
+  TRACY_ZONE_SCOPED_N("ImageCodec::onMakeBuffer");
   auto pixelBuffer = PixelBuffer::Make(width(), height(), isAlphaOnly(), tryHardware);
   if (pixelBuffer == nullptr) {
     return nullptr;

src/core/ImageDecoder.cpp

@@ -41,7 +41,7 @@ class ImageBufferWrapper : public ImageDecoder {
   }
 
   std::shared_ptr<ImageBuffer> decode() const override {
-    TRACE_ZONE_SCOPED_N("ImageBufferWrapper::decode");
+    TRACY_ZONE_SCOPED_N("ImageBufferWrapper::decode");
     return imageBuffer;
   }
 
@@ -68,7 +68,7 @@ class ImageGeneratorWrapper : public ImageDecoder {
   }
 
   std::shared_ptr<ImageBuffer> decode() const override {
-    TRACE_ZONE_SCOPED_N("ImageGeneratorWrapper::decode");
+    TRACY_ZONE_SCOPED_N("ImageGeneratorWrapper::decode");
     return imageGenerator->makeBuffer(tryHardware);
   }
 

src/core/ShapeRasterizer.cpp

@@ -29,7 +29,7 @@ ShapeRasterizer::ShapeRasterizer(int width, int height, std::shared_ptr<Shape> s
 }
 
 std::shared_ptr<ShapeBuffer> ShapeRasterizer::makeRasterized(bool tryHardware) const {
-  TRACE_ZONE_SCOPED_N("ShapeRasterizer::makeRasterized");
+  TRACY_ZONE_SCOPED_N("ShapeRasterizer::makeRasterized");
   auto finalPath = shape->getPath();
   if (PathTriangulator::ShouldTriangulatePath(finalPath)) {
     return ShapeBuffer::MakeFrom(makeTriangles(finalPath));
@@ -38,7 +38,7 @@ std::shared_ptr<ShapeBuffer> ShapeRasterizer::makeRasterized(bool tryHardware) c
 }
 
 std::shared_ptr<ImageBuffer> ShapeRasterizer::onMakeBuffer(bool tryHardware) const {
-  TRACE_ZONE_SCOPED_N("ShapeRasterizer::onMakeBuffer");
+  TRACY_ZONE_SCOPED_N("ShapeRasterizer::onMakeBuffer");
   auto finalPath = shape->getPath();
   return makeImageBuffer(finalPath, tryHardware);
 }

src/core/SolidLayer.cpp

@@ -22,7 +22,7 @@
 
 namespace tgfx {
 std::shared_ptr<SolidLayer> SolidLayer::Make() {
-  TRACE_ZONE_SCOPED_N("SolidLayer::Make");
+  TRACY_ZONE_SCOPED_N("SolidLayer::Make");
   auto layer = std::shared_ptr<SolidLayer>(new SolidLayer());
   layer->weakThis = layer;
   return layer;