Hide the Resource class from tgfx's public APIs and use the GLResourc…

…e instead.
Tencent · Jan 6, 2024 · e2013f1 · e2013f1
1 parent 26c90cc
commit e2013f1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/DEPS b/DEPS
@@ -12,7 +12,7 @@
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "0492dac0b9af4b179617bce8cb87eaf360c5f9d5",
+        "commit": "17bed1f51dcf94445248f4e2830fe6260028bb21",
         "dir": "third_party/tgfx"
       },
       {

diff --git a/src/rendering/filters/LayerFilter.cpp b/src/rendering/filters/LayerFilter.cpp
@@ -90,17 +90,18 @@ std::shared_ptr<const FilterProgram> FilterProgram::Make(tgfx::Context* context,
   if (program == 0) {
     return nullptr;
   }
-  auto filterProgram = new FilterProgram();
+  auto filterProgram = std::shared_ptr<FilterProgram>(new FilterProgram());
   filterProgram->program = program;
   if (gl->bindVertexArray != nullptr) {
     gl->genVertexArrays(1, &filterProgram->vertexArray);
   }
   gl->genBuffers(1, &filterProgram->vertexBuffer);
-  return Resource::Wrap(context, filterProgram);
+  tgfx::GLResource::AttachToContext(context, filterProgram);
+  return filterProgram;
 }
 
 void FilterProgram::onReleaseGPU() {
-  auto gl = tgfx::GLFunctions::Get(context);
+  auto gl = tgfx::GLFunctions::Get(getContext());
   if (program > 0) {
     gl->deleteProgram(program);
     program = 0;

diff --git a/src/rendering/filters/LayerFilter.h b/src/rendering/filters/LayerFilter.h
@@ -22,30 +22,27 @@
 #include "pag/file.h"
 #include "pag/pag.h"
 #include "rendering/filters/utils/FilterHelper.h"
-#include "tgfx/gpu/Resource.h"
+#include "tgfx/opengl/GLResource.h"
 
 namespace pag {
 std::vector<tgfx::Point> ComputeVerticesForMotionBlurAndBulge(const tgfx::Rect& inputBounds,
                                                               const tgfx::Rect& outputBounds);
 
-class FilterProgram : public tgfx::Resource {
+class FilterProgram : public tgfx::GLResource {
  public:
   static std::shared_ptr<const FilterProgram> Make(tgfx::Context* context,
                                                    const std::string& vertex,
                                                    const std::string& fragment);
 
-  size_t memoryUsage() const override {
-    return 0;
-  }
-
   unsigned program = 0;
   unsigned int vertexArray = 0;
   unsigned int vertexBuffer = 0;
 
+ protected:
+  void onReleaseGPU() override;
+
  private:
   FilterProgram() = default;
-
-  void onReleaseGPU() override;
 };
 
 class LayerFilter : public Filter {