Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tgfx to the latest version. #2612

Merged
merged 5 commits into from
Dec 7, 2024
Merged

Update tgfx to the latest version. #2612

merged 5 commits into from
Dec 7, 2024

Conversation

Hparty
Copy link
Collaborator

@Hparty Hparty commented Dec 6, 2024

No description provided.

@Hparty Hparty changed the title Update tgfx to the latest version。 Update tgfx to the latest version. Dec 6, 2024
# Conflicts:
#	src/rendering/filters/layerstyle/EffectFilter.cpp
@codecov-commenter
Copy link

codecov-commenter commented Dec 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.38%. Comparing base (6af0aea) to head (afacadf).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2612   +/-   ##
=======================================
  Coverage   77.38%   77.38%           
=======================================
  Files         420      420           
  Lines       22450    22450           
  Branches     6295     6355   +60     
=======================================
  Hits        17372    17372           
+ Misses       3817     3815    -2     
- Partials     1261     1263    +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

参考一下tgfx的写法,已经不需要这个类了。这个类会多拷贝一次。

CMakeLists.txt Outdated
@@ -493,10 +500,10 @@ if (WEB)
-sMODULARIZE=1 -sENVIRONMENT='web,worker' -sEXPORT_ES6=1 -sUSE_ES6_IMPORT_META=0)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
list(APPEND PAG_COMPILE_OPTIONS -O0 -g3)
list(APPEND PAG_LINK_OPTIONS -O0 -g3 -sSAFE_HEAP=1 -Wno-limited-postlink-optimizations)
list(APPEND PAG_LINK_OPTIONS -O0 -g3 -sSAFE_HEAP=1 -Wno-limited-postlink-optimizations -s EXPORTED_FUNCTIONS=['_malloc','_free'])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不需要增加这个接口导出,后面的buffer.ts也不需要

@@ -31,6 +31,26 @@
using namespace emscripten;

namespace pag {

std::unique_ptr<ByteData> CopyDataFromUint8Array(const val& emscriptenData) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

从js拷贝内存到c++都统一用这个方法就行,不需要后面的buffer.ts

@domchen domchen merged commit a09147a into main Dec 7, 2024
8 checks passed
@domchen domchen deleted the feature/update_tgfx2 branch December 7, 2024 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants