Update tgfx to the lastest version. (#2524)

DEPS

@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "d1dfcdfd82c3847e25c9640088ca321e3625ced3",
+        "commit": "6bf0581bd6c2b9794a52abffa35e782ee82bfcd0",
         "dir": "third_party/tgfx"
       },
       {

include/pag/gpu.h

@@ -64,9 +64,9 @@ enum class Backend {
 enum class ImageOrigin {
   /**
    * The default origin of the native coordinate system in the GPU backend. For example, the
-   * SurfaceOrigin::TopLeft is actually the bottom-left origin in the OpenGL coordinate system for
-   * textures. Textures newly created by the backend API for off-screen rendering usually have a
-   * SurfaceOrigin::TopLeft origin.
+   * ImageOrigin::TopLeft is actually the bottom-left origin in the OpenGL coordinate system for
+   * textures. Textures newly created by the backend API for off-screen rendering usually have an
+   * ImageOrigin::TopLeft origin.
    */
   TopLeft,
 

qt/src/PAGView.cpp

@@ -23,7 +23,7 @@
 #include <QThread>
 #include "pag/file.h"
 #include "platform/qt/GPUDrawable.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 class RenderThread : public QThread {

src/base/ByteData.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "pag/file.h"
-#include "tgfx/utils/Stream.h"
+#include "tgfx/core/Stream.h"
 
 namespace pag {
 std::unique_ptr<ByteData> ByteData::FromPath(const std::string& filePath) {

src/c/ext/egl/pag_egl_globals.cpp

@@ -18,7 +18,7 @@
 
 #include "pag/c/ext/egl/pag_egl_globals.h"
 #include <mutex>
-#include "tgfx/opengl/egl/EGLGlobals.h"
+#include "tgfx/gpu/opengl/egl/EGLGlobals.h"
 
 static std::mutex eglGlobalsLocker = {};
 

src/c/ext/pag_surface_ext.cpp

@@ -20,7 +20,7 @@
 #include "c/pag_types_priv.h"
 #include "pag/pag.h"
 #include "rendering/drawables/DoubleBufferedDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 pag_surface* pag_surface_make_offscreen_double_buffered(int width, int height, bool tryHardware,
                                                         void* sharedContext) {

src/codec/mp4/MP4BoxHelper.cpp

@@ -20,7 +20,7 @@
 #include "MP4Generator.h"
 #include "base/utils/Log.h"
 #include "codec/utils/EncodeStream.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 static const int SEQUENCE_NUMBER = 1;

src/codec/mp4/MP4Generator.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "MP4Generator.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 #define PushInWriteFun(funName)                                                         \
   writeFun.emplace_back([this](auto&& PH1, auto&& PH2) -> int {                         \

src/codec/utils/DecodeStream.h

@@ -21,7 +21,7 @@
 #include <string>
 #include "codec/utils/StreamContext.h"
 #include "pag/types.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 

src/codec/utils/EncodeStream.h

@@ -20,7 +20,7 @@
 
 #include "codec/utils/StreamContext.h"
 #include "pag/file.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 

src/platform/android/GPUDrawable.cpp

@@ -18,7 +18,7 @@
 
 #include "GPUDrawable.h"
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(ANativeWindow* nativeWindow,

src/platform/android/GPUDrawable.h

@@ -21,7 +21,7 @@
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 

src/platform/android/HardwareDecoder.cpp

@@ -19,8 +19,8 @@
 #include "HardwareDecoder.h"
 #include "base/utils/Log.h"
 #include "platform/android/JStringUtil.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 static Global<jclass> HardwareDecoderClass;

src/platform/android/JNativeTask.cpp

@@ -18,7 +18,7 @@
 
 #include <jni.h>
 #include "JNIHelper.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 extern "C" PAG_API void Java_org_libpag_NativeTask_Run(JNIEnv* env, jclass, jobject runnable) {
   static pag::Global<jclass> runnableClass = env->FindClass("java/lang/Runnable");

src/platform/cocoa/private/NativeTextShaper.mm

@@ -18,8 +18,8 @@
 
 #include "NativeTextShaper.h"
 #include <CoreText/CoreText.h>
+#include "tgfx/core/UTF.h"
 #include "tgfx/platform/apple/CTTypeface.h"
-#include "tgfx/utils/UTF.h"
 
 namespace pag {
 std::optional<PositionedGlyphs> NativeTextShaper::Shape(

src/platform/cocoa/private/PAGFileImpl.mm

@@ -19,7 +19,7 @@
 #import "PAGFileImpl.h"
 
 #include "pag/pag.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 #import "PAGDiskCacheImpl.h"
 #import "PAGLayerImpl+Internal.h"

src/platform/ios/private/GPUDrawable.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/eagl/EAGLWindow.h"
+#include "tgfx/gpu/opengl/eagl/EAGLWindow.h"
 
 namespace pag {
 

src/platform/ios/private/PAGSurfaceImpl.mm

@@ -25,7 +25,7 @@
 #include "pag/types.h"
 #include "platform/cocoa/private/PixelBufferUtil.h"
 #include "rendering/drawables/HardwareBufferDrawable.h"
-#include "tgfx/opengl/eagl/EAGLDevice.h"
+#include "tgfx/gpu/opengl/eagl/EAGLDevice.h"
 
 @interface PAGSurfaceImpl ()
 

src/platform/mac/private/GPUDrawable.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/cgl/CGLWindow.h"
+#include "tgfx/gpu/opengl/cgl/CGLWindow.h"
 
 namespace pag {
 class GPUDrawable : public Drawable {

src/platform/mac/private/GPUDrawable.mm

@@ -17,8 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "GPUDrawable.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/cgl/CGLWindow.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/cgl/CGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromView(NSView* view) {

src/platform/ohos/GPUDrawable.cpp

@@ -19,7 +19,7 @@
 #include "GPUDrawable.h"
 #include <native_window/external_window.h>
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
+#include "tgfx/core/Surface.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(NativeWindow* nativeWindow,

src/platform/ohos/GPUDrawable.h

@@ -20,7 +20,7 @@
 
 #include <native_window/external_window.h>
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 

src/platform/ohos/JPAGImage.cpp

@@ -19,9 +19,9 @@
 #include <js_native_api.h>
 #include <rawfile/raw_file.h>
 #include <rawfile/raw_file_manager.h>
-#include <tgfx/platform/ohos/OHOSPixelMap.h>
 #include "JsHelper.h"
 #include "rendering/editing/StillImage.h"
+#include "tgfx/platform/ohos/OHOSPixelMap.h"
 
 namespace pag {
 

src/platform/ohos/JsHelper.cpp

@@ -19,8 +19,8 @@
 #include "JsHelper.h"
 #include <multimedia/image_framework/image/pixelmap_native.h>
 #include <multimedia/image_framework/image_pixel_map_mdk.h>
-#include <tgfx/core/ImageInfo.h>
 #include "base/utils/Log.h"
+#include "tgfx/core/ImageInfo.h"
 
 namespace pag {
 

src/platform/qt/GPUDrawable.cpp

@@ -18,7 +18,7 @@
 
 #include "GPUDrawable.h"
 #include <QQuickWindow>
-#include "tgfx/opengl/qt/QGLWindow.h"
+#include "tgfx/gpu/opengl/qt/QGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::MakeFrom(QQuickItem* quickItem,

src/platform/web/GPUDrawable.cpp

@@ -18,8 +18,8 @@
 
 #include "GPUDrawable.h"
 #include "base/utils/Log.h"
-#include "tgfx/gpu/Surface.h"
-#include "tgfx/opengl/GLDefines.h"
+#include "tgfx/core/Surface.h"
+#include "tgfx/gpu/opengl/GLDefines.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromCanvasID(const std::string& canvasID) {

src/platform/web/GPUDrawable.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "rendering/drawables/Drawable.h"
-#include "tgfx/opengl/webgl/WebGLWindow.h"
+#include "tgfx/gpu/opengl/webgl/WebGLWindow.h"
 
 namespace pag {
 class GPUDrawable : public Drawable {

src/platform/web/HardwareDecoder.cpp

@@ -20,7 +20,7 @@
 #include "WebVideoSequenceDemuxer.h"
 #include "base/utils/TimeUtil.h"
 #include "rendering/sequences/VideoSequenceDemuxer.h"
-#include "tgfx/opengl/GLFunctions.h"
+#include "tgfx/gpu/opengl/GLFunctions.h"
 
 using namespace emscripten;
 

src/platform/web/NativeTextShaper.cpp

@@ -19,7 +19,7 @@
 #include "NativeTextShaper.h"
 #include "UnicodeEmojiTable.hh"
 #include "rendering/FontManager.h"
-#include "tgfx/utils/UTF.h"
+#include "tgfx/core/UTF.h"
 
 namespace pag {
 template <typename T>

src/platform/web/PAGWasmBindings.cpp

@@ -26,7 +26,7 @@
 #include "rendering/editing/StillImage.h"
 #include "tgfx/core/ImageInfo.h"
 #include "tgfx/core/PathTypes.h"
-#include "tgfx/opengl/GLDefines.h"
+#include "tgfx/gpu/opengl/GLDefines.h"
 
 using namespace emscripten;
 

src/platform/win/GPUDrawable.cpp

@@ -19,7 +19,7 @@
 #include "GPUDrawable.h"
 #include <windows.h>
 #include "base/utils/Log.h"
-#include "tgfx/opengl/egl/EGLWindow.h"
+#include "tgfx/gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {
 std::shared_ptr<GPUDrawable> GPUDrawable::FromWindow(void* nativeWindow, void* sharedContext) {

src/rendering/PAGAnimator.cpp

@@ -20,8 +20,8 @@
 #include "base/utils/TimeUtil.h"
 #include "platform/Platform.h"
 #include "rendering/utils/DisplayLinkWrapper.h"
-#include "tgfx/utils/Clock.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Clock.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 static constexpr int AnimationTypeEnd = 1;

src/rendering/PAGAnimator.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "pag/pag.h"
-#include "tgfx/utils/Task.h"
+#include "tgfx/core/Task.h"
 
 namespace pag {
 /**

src/rendering/PAGPlayer.cpp

@@ -25,7 +25,7 @@
 #include "rendering/utils/ApplyScaleMode.h"
 #include "rendering/utils/LockGuard.h"
 #include "rendering/utils/ScopedLock.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 PAGPlayer::PAGPlayer() {

src/rendering/PAGSurface.cpp

@@ -24,7 +24,7 @@
 #include "rendering/utils/GLRestorer.h"
 #include "rendering/utils/LockGuard.h"
 #include "rendering/utils/shaper/TextShaper.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 

src/rendering/PAGSurfaceFactory.cpp

@@ -23,7 +23,7 @@
 #include "rendering/drawables/OffscreenDrawable.h"
 #include "rendering/drawables/RenderTargetDrawable.h"
 #include "rendering/drawables/TextureDrawable.h"
-#include "tgfx/opengl/GLDevice.h"
+#include "tgfx/gpu/opengl/GLDevice.h"
 
 namespace pag {
 std::shared_ptr<PAGSurface> PAGSurface::MakeFrom(std::shared_ptr<Drawable> drawable) {

src/rendering/Performance.h

@@ -20,7 +20,7 @@
 
 #include "base/utils/Log.h"
 #include "pag/types.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 class Performance {

src/rendering/caches/DiskCache.cpp

@@ -20,9 +20,9 @@
 #include "pag/pag.h"
 #include "platform/Platform.h"
 #include "rendering/utils/Directory.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/DataView.h"
-#include "tgfx/utils/Stream.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/DataView.h"
+#include "tgfx/core/Stream.h"
 
 namespace pag {
 class FileInfo {

src/rendering/caches/RenderCache.cpp

@@ -27,7 +27,7 @@
 #include "rendering/renderers/FilterRenderer.h"
 #include "rendering/sequences/SequenceImageProxy.h"
 #include "rendering/sequences/SequenceInfo.h"
-#include "tgfx/utils/Clock.h"
+#include "tgfx/core/Clock.h"
 
 namespace pag {
 // 300M设置的大一些用于兜底，通常在大于20M时就开始随时清理。

src/rendering/caches/SequenceFile.cpp

@@ -22,8 +22,8 @@
 #include "base/utils/Log.h"
 #include "pag/file.h"
 #include "rendering/utils/Directory.h"
-#include "tgfx/utils/Buffer.h"
-#include "tgfx/utils/DataView.h"
+#include "tgfx/core/Buffer.h"
+#include "tgfx/core/DataView.h"
 
 namespace pag {
 static constexpr uint8_t FILE_VERSION = 1;

src/rendering/caches/SequenceFile.h

@@ -25,8 +25,8 @@
 #include "rendering/utils/BitmapBuffer.h"
 #include "rendering/utils/LZ4Decoder.h"
 #include "rendering/utils/LZ4Encoder.h"
+#include "tgfx/core/Buffer.h"
 #include "tgfx/core/ImageInfo.h"
-#include "tgfx/utils/Buffer.h"
 
 namespace pag {
 class DiskCache;