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

Validate shared VertexLayout from Shader Program

This commit is contained in:
halx99 2022-10-20 20:22:28 +08:00
parent cebba41a1e
commit d2da0d6078
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/2d/CCDrawNode.cpp
View File

@ -170,10 +170,17 @@ void DrawNode::updateShaderInternal(CustomCommand& cmd,
auto program = backend::Program::getBuiltinProgram(programType); auto program = backend::Program::getBuiltinProgram(programType);
pipelinePS = new backend::ProgramState(program); pipelinePS = new backend::ProgramState(program);
setVertexLayout(cmd);
cmd.setPrimitiveType(primitiveType); cmd.setPrimitiveType(primitiveType);
cmd.setDrawType(drawType); cmd.setDrawType(drawType);
} }
void DrawNode::setVertexLayout(CustomCommand& cmd)
{
auto* programState = cmd.getPipelineDescriptor().programState;
programState->validateSharedVertexLayout(VertexLayoutHelper::setupDrawNode);
}
void DrawNode::freeShaderInternal(CustomCommand& cmd) void DrawNode::freeShaderInternal(CustomCommand& cmd)
{ {
auto& pipelinePS = cmd.getPipelineDescriptor().programState; auto& pipelinePS = cmd.getPipelineDescriptor().programState;

2
core/2d/CCDrawNode.h
View File

@ -378,6 +378,8 @@ protected:
CustomCommand::PrimitiveType primitiveType); CustomCommand::PrimitiveType primitiveType);
void freeShaderInternal(CustomCommand& cmd); void freeShaderInternal(CustomCommand& cmd);
void setVertexLayout(CustomCommand& cmd);
void updateBlendState(CustomCommand& cmd); void updateBlendState(CustomCommand& cmd);
void updateUniforms(const Mat4& transform, CustomCommand& cmd); void updateUniforms(const Mat4& transform, CustomCommand& cmd);