adjusted order of codes in Std2DMaterialLoader.cpp and Std3DMaterialLoader.cpp
This commit is contained in:
parent
dd6b2f4fb3
commit
c469fde84a
@ -73,12 +73,12 @@ namespace
|
|||||||
|
|
||||||
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
|
bool CustomVertexShader(ShaderCreateInfoVertex *vsc) override
|
||||||
{
|
{
|
||||||
if(!Std2DMaterial::CustomVertexShader(vsc))
|
|
||||||
return(false);
|
|
||||||
|
|
||||||
for(auto &ua:mfd->vi)
|
for(auto &ua:mfd->vi)
|
||||||
vsc->AddInput(ua.vat,ua.name);
|
vsc->AddInput(ua.vat,ua.name);
|
||||||
|
|
||||||
|
if(!Std2DMaterial::CustomVertexShader(vsc))
|
||||||
|
return(false);
|
||||||
|
|
||||||
return CommonProc(VK_SHADER_STAGE_VERTEX_BIT,vsc);
|
return CommonProc(VK_SHADER_STAGE_VERTEX_BIT,vsc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,12 +73,12 @@ public:
|
|||||||
|
|
||||||
bool CustomVertexShader(ShaderCreateInfoVertex* vsc) override
|
bool CustomVertexShader(ShaderCreateInfoVertex* vsc) override
|
||||||
{
|
{
|
||||||
if (!Std3DMaterial::CustomVertexShader(vsc))
|
|
||||||
return (false);
|
|
||||||
|
|
||||||
for (auto& ua : mfd->vi)
|
for (auto& ua : mfd->vi)
|
||||||
vsc->AddInput(ua.vat, ua.name);
|
vsc->AddInput(ua.vat, ua.name);
|
||||||
|
|
||||||
|
if (!Std3DMaterial::CustomVertexShader(vsc))
|
||||||
|
return (false);
|
||||||
|
|
||||||
return CommonProc(VK_SHADER_STAGE_VERTEX_BIT, vsc);
|
return CommonProc(VK_SHADER_STAGE_VERTEX_BIT, vsc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user