Add ResourceCache and ProgramCache classes.

Tencent · Feb 11, 2022 · 60919a0 · 60919a0
1 parent 4138fac
commit 60919a0
Show file tree

Hide file tree

Showing 81 changed files with 549 additions and 315 deletions.
diff --git a/src/platform/android/GPUDrawable.cpp b/src/platform/android/GPUDrawable.cpp
@@ -17,6 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "GPUDrawable.h"
+#include "base/utils/Log.h"
 #include "gpu/Surface.h"
 
 namespace pag {

diff --git a/src/platform/android/VideoSurface.cpp b/src/platform/android/VideoSurface.cpp
@@ -128,7 +128,7 @@ jobject VideoSurface::getOutputSurface(JNIEnv* env) const {
 
 bool VideoSurface::attachToContext(Context* context) {
   if (oesTexture) {
-    if (deviceID != context->getDevice()->uniqueID()) {
+    if (deviceID != context->device()->uniqueID()) {
       LOGE("VideoSurface::attachToGLContext(): VideoSurface has already attached to a Context!");
       return false;
     }
@@ -146,7 +146,7 @@ bool VideoSurface::attachToContext(Context* context) {
   }
   auto result = env->CallBooleanMethod(videoSurface.get(), VideoSurface_attachToGLContext,
                                        oesTexture->getGLInfo().id);
-  deviceID = context->getDevice()->uniqueID();
+  deviceID = context->device()->uniqueID();
   if (!result) {
     LOGE("VideoSurface::attachToGLContext(): failed to attached to a Surface!");
     oesTexture = nullptr;

diff --git a/src/platform/cocoa/private/TraceImage.mm b/src/platform/cocoa/private/TraceImage.mm
@@ -18,6 +18,7 @@
 
 #include "TraceImage.h"
 #include "PixelBufferUtils.h"
+#include "base/utils/Log.h"
 #include "core/Bitmap.h"
 
 namespace pag {

diff --git a/src/platform/web/GPUDrawable.cpp b/src/platform/web/GPUDrawable.cpp
@@ -17,6 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "GPUDrawable.h"
+#include "base/utils/Log.h"
 #include "gpu/Surface.h"
 #include "gpu/opengl/GLDefines.h"
 

diff --git a/src/platform/win/GPUDrawable.cpp b/src/platform/win/GPUDrawable.cpp
@@ -18,6 +18,7 @@
 
 #include "GPUDrawable.h"
 #include <windows.h>
+#include "base/utils/Log.h"
 #include "gpu/opengl/egl/EGLWindow.h"
 
 namespace pag {

diff --git a/src/rendering/caches/RenderCache.cpp b/src/rendering/caches/RenderCache.cpp
@@ -177,13 +177,13 @@ void RenderCache::prepareFrame() {
 }
 
 void RenderCache::attachToContext(Context* current, bool forHitTest) {
-  if (deviceID > 0 && deviceID != current->getDevice()->uniqueID()) {
+  if (deviceID > 0 && deviceID != current->device()->uniqueID()) {
     // Context 改变需要清理内部所有缓存，这里用 uniqueID
     // 而不用指针比较，是因为指针析构后再创建可能会地址重合。
     releaseAll();
   }
   context = current;
-  deviceID = context->getDevice()->uniqueID();
+  deviceID = context->device()->uniqueID();
   hitTestOnly = forHitTest;
   if (hitTestOnly) {
     return;

diff --git a/src/rendering/graphics/Glyph.h b/src/rendering/graphics/Glyph.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "base/utils/BytesKey.h"
 #include "core/Font.h"
+#include "core/utils/BytesKey.h"
 #include "pag/types.h"
 
 namespace pag {

diff --git a/src/rendering/graphics/Modifier.cpp b/src/rendering/graphics/Modifier.cpp
@@ -19,6 +19,7 @@
 #include "Modifier.h"
 #include "Graphic.h"
 #include "base/utils/MatrixUtil.h"
+#include "base/utils/UniqueID.h"
 #include "core/Blend.h"
 #include "gpu/Surface.h"
 

diff --git a/src/rendering/graphics/Picture.cpp b/src/rendering/graphics/Picture.cpp
@@ -441,7 +441,7 @@ class BackendTextureProxy : public TextureProxy {
   void* sharedContext = nullptr;
 
   bool checkContext(Context* context) const {
-    auto glDevice = static_cast<GLDevice*>(context->getDevice());
+    auto glDevice = static_cast<GLDevice*>(context->device());
     if (!glDevice->sharableWith(sharedContext)) {
       LOGE(
           "A Graphic which made from a texture can not be drawn on to a PAGSurface"

diff --git a/src/rendering/graphics/TextureProxy.h b/src/rendering/graphics/TextureProxy.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "gpu/Context.h"
+#include "gpu/Texture.h"
 
 namespace pag {
 class RenderCache;

diff --git a/src/rendering/utils/MemoryCalculator.cpp b/src/rendering/utils/MemoryCalculator.cpp
@@ -17,6 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "MemoryCalculator.h"
+#include "base/utils/Log.h"
 #include "rendering/caches/LayerCache.h"
 
 namespace pag {

diff --git a/test/framework/utils/LzmaUtil.h b/test/framework/utils/LzmaUtil.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <vector>
 #include "core/Data.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Bitmap.h b/tgfx/include/core/Bitmap.h
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include "EncodedFormat.h"
-#include "ImageInfo.h"
 #include "core/Data.h"
+#include "core/EncodedFormat.h"
+#include "core/ImageInfo.h"
 #include "core/PixelBuffer.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Blend.h b/tgfx/include/core/Blend.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "pag/types.h"
-
 namespace pag {
 /**
  * Defines constant values for visual blend mode effects.

diff --git a/tgfx/include/core/Data.h b/tgfx/include/core/Data.h
@@ -18,7 +18,8 @@
 
 #pragma once
 
-#include "pag/types.h"
+#include <memory>
+#include <string>
 
 namespace pag {
 /**

diff --git a/tgfx/include/core/Font.h b/tgfx/include/core/Font.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Typeface.h"
+#include "core/Typeface.h"
 
 namespace pag {
 /**

diff --git a/tgfx/include/core/Image.h b/tgfx/include/core/Image.h
@@ -18,11 +18,10 @@
 
 #pragma once
 
-#include "EncodedFormat.h"
-#include "ImageInfo.h"
-#include "Orientation.h"
 #include "core/Data.h"
-#include "pag/types.h"
+#include "core/EncodedFormat.h"
+#include "core/ImageInfo.h"
+#include "core/Orientation.h"
 
 namespace pag {
 

diff --git a/tgfx/include/core/ImageInfo.h b/tgfx/include/core/ImageInfo.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "base/utils/Log.h"
 #include "pag/types.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Mask.h b/tgfx/include/core/Mask.h
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include "Font.h"
-#include "Path.h"
-#include "TextBlob.h"
+#include "core/Font.h"
+#include "core/Path.h"
 #include "core/Stroke.h"
+#include "core/TextBlob.h"
 #include "gpu/TextureBuffer.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Path.h b/tgfx/include/core/Path.h
@@ -18,8 +18,7 @@
 
 #pragma once
 
-#include "PathTypes.h"
-#include "base/utils/Log.h"
+#include "core/PathTypes.h"
 #include "pag/types.h"
 
 namespace pag {

diff --git a/tgfx/include/core/PathEffect.h b/tgfx/include/core/PathEffect.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Path.h"
+#include "core/Path.h"
 #include "core/Stroke.h"
 
 namespace pag {

diff --git a/tgfx/include/core/PathMeasure.h b/tgfx/include/core/PathMeasure.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Path.h"
+#include "core/Path.h"
 
 namespace pag {
 /**

diff --git a/tgfx/include/core/PixelBuffer.h b/tgfx/include/core/PixelBuffer.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "ImageInfo.h"
+#include "core/ImageInfo.h"
 #include "gpu/TextureBuffer.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Stream.h b/tgfx/include/core/Stream.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "pag/types.h"
+#include <string>
 
 namespace pag {
 /**

diff --git a/tgfx/include/core/TextBlob.h b/tgfx/include/core/TextBlob.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "Font.h"
-#include "Path.h"
+#include "core/Font.h"
+#include "core/Path.h"
 #include "core/Stroke.h"
 
 namespace pag {

diff --git a/tgfx/include/core/Typeface.h b/tgfx/include/core/Typeface.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "FontMetrics.h"
-#include "Path.h"
+#include "core/FontMetrics.h"
+#include "core/Path.h"
 #include "gpu/TextureBuffer.h"
 
 namespace pag {

diff --git a/tgfx/include/gpu/Context.h b/tgfx/include/gpu/Context.h
@@ -18,49 +18,51 @@
 
 #pragma once
 
-#include <list>
-#include <unordered_map>
-#include "base/utils/BytesKey.h"
-#include "base/utils/UniqueID.h"
 #include "core/Color4f.h"
-#include "gpu/Caps.h"
+#include "core/utils/BytesKey.h"
 #include "gpu/Device.h"
 #include "pag/gpu.h"
 
 namespace pag {
+class ProgramCache;
 
-class Resource;
-
-class Texture;
-
-class Program;
+class GradientCache;
 
-class ProgramCreator;
+class ResourceCache;
 
-class GradientCache;
+class Caps;
 
 class Context {
  public:
   virtual ~Context();
 
   /**
-   * Returns the unique ID of the associated device.
+   * Returns the associated device.
    */
-  Device* getDevice() const;
+  Device* device() const {
+    return _device;
+  }
 
   /**
-   * Returns a program cache of specified ProgramMaker. If there is no associated cache available,
-   * a new program will be created by programMaker. Returns null if the programMaker fails to make a
-   * new program.
+   * Returns the associated cache that manages the lifetime of all gradients.
    */
-  Program* getProgram(const ProgramCreator* programMaker);
+  GradientCache* gradientCache() const {
+    return _gradientCache;
+  }
 
-  const Texture* getGradient(const Color4f* colors, const float* positions, int count);
+  /**
+   * Returns the associated cache that manages the lifetime of all Program instances.
+   */
+  ProgramCache* programCache() const {
+    return _programCache;
+  }
 
   /**
-   * Returns a reusable resource in the cache.
+   * Returns the associated cache that manages the lifetime of all Resource instances.
    */
-  std::shared_ptr<Resource> getRecycledResource(const BytesKey& recycleKey);
+  ResourceCache* resourceCache() const {
+    return _resourceCache;
+  }
 
   /**
    * Purges GPU resources that haven't been used in the past 'usNotUsed' microseconds.
@@ -81,33 +83,18 @@ class Context {
   explicit Context(Device* device);
 
  private:
-  Device* device = nullptr;
-  bool purgingResource = false;
-  std::list<Program*> programLRU = {};
-  std::unordered_map<BytesKey, Program*, BytesHasher> programMap = {};
-  GradientCache* gradientCache = nullptr;
-  std::vector<Resource*> nonpurgeableResources = {};
-  std::vector<std::shared_ptr<Resource>> strongReferences = {};
-  std::unordered_map<BytesKey, std::vector<Resource*>, BytesHasher> recycledResources = {};
-  std::mutex removeLocker = {};
-  std::vector<Resource*> pendingRemovedResources = {};
-
-  static void AddToList(std::vector<Resource*>& list, Resource* resource);
-  static void RemoveFromList(std::vector<Resource*>& list, Resource* resource);
-  static void NotifyReferenceReachedZero(Resource* resource);
-
-  std::shared_ptr<Resource> wrapResource(Resource* resource);
-  void removeResource(Resource* resource);
-  void removeOldestProgram(bool releaseGPU = true);
+  Device* _device = nullptr;
+  GradientCache* _gradientCache = nullptr;
+  ProgramCache* _programCache = nullptr;
+  ResourceCache* _resourceCache = nullptr;
+
   void releaseAll(bool releaseGPU);
   void onLocked();
   void onUnlocked();
 
   friend class Device;
 
   friend class Resource;
-
-  friend class PurgeGuard;
 };
 
 }  // namespace pag
diff --git a/tgfx/include/gpu/Device.h b/tgfx/include/gpu/Device.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "base/utils/Log.h"
 #include "pag/types.h"
 
 namespace pag {
@@ -65,6 +64,6 @@ class Device {
   uint32_t _uniqueID = 0;
   bool contextLocked = false;
 
-  friend class Context;
+  friend class ResourceCache;
 };
 }  // namespace pag