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

fix memory leak (#20258)

This commit is contained in:
coulsonwang 2019-10-28 15:04:03 +08:00 committed by minggo
parent 7f796936ee
commit 2d42aa1d21
3 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/2d/CCSprite.cpp
View File

@ -450,7 +450,6 @@ void Sprite::setTexture(Texture2D *texture)
}
auto isETC1 = texture && texture->getAlphaTextureName();
setProgramState((isETC1) ? backend::ProgramType::ETC1 : backend::ProgramType::POSITION_TEXTURE_COLOR);
updateProgramState();
}
void Sprite::updateProgramState()

2
cocos/renderer/backend/ProgramState.cpp
View File

@ -424,6 +424,7 @@ void ProgramState::setTexture(int location, uint32_t slot, backend::TextureBacke
if(location < 0)
return;
TextureInfo& info = textureInfo[location];
info.releaseTextures();
info.slot = {slot};
info.textures = {texture};
info.retainTextures();
@ -436,6 +437,7 @@ void ProgramState::setTextureArray(int location, const std::vector<uint32_t>& sl
{
assert(slots.size() == textures.size());
TextureInfo& info = textureInfo[location];
info.releaseTextures();
info.slot = slots;
info.textures = textures;
info.retainTextures();

37
tests/cpp-tests/Classes/NodeTest/NodeTest.cpp
View File

@ -977,7 +977,6 @@ public:
}
virtual void setProgramState(backend::ProgramState* programState) override;
virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
void onDraw(const Mat4 &transform, uint32_t flags);
protected:
CustomCommand _customCommand;
@ -989,7 +988,6 @@ void MySprite::setProgramState(backend::ProgramState* programState)
Sprite::setProgramState(programState);
auto& pipelineDescriptor = _customCommand.getPipelineDescriptor();
pipelineDescriptor.programState = programState;
_customCommand.getPipelineDescriptor().programState->setTexture(_textureLocation, 0, _texture->getBackendTexture());
_customCommand.setDrawType(CustomCommand::DrawType::ARRAY);
_customCommand.setPrimitiveType(CustomCommand::PrimitiveType::TRIANGLE_STRIP);
@ -1006,41 +1004,6 @@ void MySprite::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
renderer->addCommand(&_customCommand);
}
void MySprite::onDraw(const Mat4 &transform, uint32_t flags)
{
// getGLProgram()->use();
// getGLProgram()->setUniformsForBuiltins(transform);
// cocos2d::utils::setBlending(_blendFunc.src, _blendFunc.dst);
// glActiveTexture(GL_TEXTURE0);
// glBindTexture(GL_TEXTURE_2D, _texture->getName());
// glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
// glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
// glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
#define kQuadSize sizeof(_quad.bl)
// size_t offset = (size_t)&_quad;
// vertex
int diff = offsetof( V3F_C4B_T2F, vertices);
// glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, kQuadSize, (void*) (offset + diff));
// texCoords
diff = offsetof( V3F_C4B_T2F, texCoords);
// glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, kQuadSize, (void*)(offset + diff));
// color
diff = offsetof( V3F_C4B_T2F, colors);
// glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, kQuadSize, (void*)(offset + diff));
//TODO coulsonwang
// glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
//
// CHECK_GL_ERROR_DEBUG();
CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,4);
}
//------------------------------------------------------------------
//
// CameraTest1