git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 13:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine: a minor optimization.

Browse source 
reduced the point counting since we already know some of them.
This commit is contained in:
Hermet Park 2023-08-28 16:30:35 +09:00
parent ab77e1d3d4
commit 992891e6a8
1 changed files with 17 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/renderer/sw_engine/tvgSwShape.cpp
View file

@ -243,38 +243,20 @@ static SwOutline* _genDashOutline(const RenderShape* rshape, const Matrix* trans
dash.outline = static_cast<SwOutline*>(calloc(1, sizeof(SwOutline))); dash.outline = static_cast<SwOutline*>(calloc(1, sizeof(SwOutline)));
//smart reservation //smart reservation
auto outlinePtsCnt = 0; auto closeCnt = 0;
auto outlineCntrsCnt = 0; auto moveCnt = 0;
for (uint32_t i = 0; i < cmdCnt; ++i) { for (uint32_t i = 0; i < cmdCnt; ++i) {
switch (*(cmds + i)) { auto cmd = *(cmds + i);
case PathCommand::Close: { if (cmd == PathCommand::Close) ++closeCnt;
++outlinePtsCnt; else if (cmd == PathCommand::MoveTo) ++moveCnt;
break;
}
case PathCommand::MoveTo: {
++outlineCntrsCnt;
++outlinePtsCnt;
break;
}
case PathCommand::LineTo: {
++outlinePtsCnt;
break;
}
case PathCommand::CubicTo: {
outlinePtsCnt += 3;
break;
}
}
} }
++outlinePtsCnt; //for close
++outlineCntrsCnt; //for end
//No idea exact count.... Reserve Approximitely 20x... //No idea exact count.... Reserve Approximitely 20x...
dash.outline->pts.grow(20 * outlinePtsCnt); //OPTIMIZE: we can directly copy the path points when the close is occupied with a point.
dash.outline->types.grow(20 * outlinePtsCnt); dash.outline->pts.grow(20 * (closeCnt + ptsCnt + 1));
dash.outline->cntrs.grow(20 * outlineCntrsCnt); dash.outline->types.grow(20 * (closeCnt + ptsCnt + 1));
dash.outline->cntrs.grow(20 * (moveCnt + 1));
while (cmdCnt-- > 0) { while (cmdCnt-- > 0) {
switch (*cmds) { switch (*cmds) {
@ -342,47 +324,22 @@ static bool _genOutline(SwShape* shape, const RenderShape* rshape, const Matrix*
if (cmdCnt == 0 || ptsCnt == 0) return false; if (cmdCnt == 0 || ptsCnt == 0) return false;
//smart reservation //smart reservation
auto outlinePtsCnt = 0; auto moveCnt = 0;
auto outlineCntrsCnt = 0;
auto closeCnt = 0; auto closeCnt = 0;
for (uint32_t i = 0; i < cmdCnt; ++i) { for (uint32_t i = 0; i < cmdCnt; ++i) {
switch (*(cmds + i)) { auto cmd = *(cmds + i);
case PathCommand::Close: { if (cmd == PathCommand::Close) ++closeCnt;
++outlinePtsCnt; else if (cmd == PathCommand::MoveTo) ++moveCnt;
++closeCnt;
break;
}
case PathCommand::MoveTo: {
++outlineCntrsCnt;
++outlinePtsCnt;
break;
}
case PathCommand::LineTo: {
++outlinePtsCnt;
break;
}
case PathCommand::CubicTo: {
outlinePtsCnt += 3;
break;
}
}
} }
if (static_cast<uint32_t>(outlinePtsCnt - closeCnt) > ptsCnt) {
TVGERR("SW_ENGINE", "Wrong a pair of the commands & points - required(%d), current(%d)", outlinePtsCnt - closeCnt, ptsCnt);
return false;
}
++outlinePtsCnt; //for close
++outlineCntrsCnt; //for end
shape->outline = mpoolReqOutline(mpool, tid); shape->outline = mpoolReqOutline(mpool, tid);
auto outline = shape->outline; auto outline = shape->outline;
outline->pts.grow(outlinePtsCnt); //OPTIMIZE: we can directly copy the path points when the close is occupied with a point.
outline->types.grow(outlinePtsCnt); outline->pts.grow(ptsCnt + closeCnt + 1);
outline->cntrs.grow(outlineCntrsCnt); outline->types.grow(ptsCnt + closeCnt + 1);
outline->cntrs.grow(moveCnt + 1);
//Dash outlines are always opened. //Dash outlines are always opened.
//Only normal outlines use this information, it sholud be same to their contour counts. //Only normal outlines use this information, it sholud be same to their contour counts.