Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801

This commit is contained in:
halx99 2020-10-27 17:08:26 +08:00
parent 4c05ca5004
commit 865c1e22ac
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/spine/v4/SkeletonBatch.cpp
View File

@ -163,20 +163,18 @@ cocos2d::TrianglesCommand* SkeletonBatch::addCommand(cocos2d::Renderer* renderer
CCASSERT(programState, "programState should not be null"); CCASSERT(programState, "programState should not be null");
auto& pipelinePS = command->getPipelineDescriptor().programState; auto& pipelinePS = command->getPipelineDescriptor().programState;
if (pipelinePS != programState) if (pipelinePS == nullptr || pipelinePS->getProgram() != programState->getProgram())
{ {
CC_SAFE_RELEASE(pipelinePS); CC_SAFE_RELEASE(pipelinePS);
pipelinePS = programState; pipelinePS = programState->clone();
CC_SAFE_RETAIN(pipelinePS);
updateProgramStateLayout(pipelinePS); updateProgramStateLayout(pipelinePS);
} }
pipelinePS->setUniform(_locMVP, projectionMat.m, sizeof(projectionMat.m)); pipelinePS->setUniform(_locMVP, projectionMat.m, sizeof(projectionMat.m));
pipelinePS->setTexture(_locTexture, 0, texture->getBackendTexture()); pipelinePS->setTexture(_locTexture, 0, texture->getBackendTexture());
command->init(globalOrder, texture, blendType, triangles, mv, flags); command->init(globalOrder, texture, blendType, triangles, mv, flags);
renderer->addCommand(command); renderer->addCommand(command);
return command; return command;
} }