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

Improve Sprite programState update logic

This commit is contained in:
halx99 2021-06-27 21:43:21 +08:00
parent a84067eb74
commit de8334416d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCSprite.cpp
View File

@ -418,7 +418,9 @@ void Sprite::setTexture(Texture2D *texture)
} }
} }
bool needsUpdatePS = _texture == nullptr || _texture->getSamplerFlags() != texture->getSamplerFlags(); bool needsUpdatePS =
(!_programState || _programState->getProgram()->getProgramType() < backend::ProgramType::CUSTOM_PROGRAM) &&
(_texture == nullptr || _texture->getSamplerFlags() != texture->getSamplerFlags());
if (_renderMode != RenderMode::QUAD_BATCHNODE) if (_renderMode != RenderMode::QUAD_BATCHNODE)
{ {
@ -433,6 +435,8 @@ void Sprite::setTexture(Texture2D *texture)
if (needsUpdatePS) if (needsUpdatePS)
setProgramState(backend::ProgramType::POSITION_TEXTURE_COLOR); setProgramState(backend::ProgramType::POSITION_TEXTURE_COLOR);
else
updateProgramStateTexture(_texture);
} }
Texture2D* Sprite::getTexture() const Texture2D* Sprite::getTexture() const