hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to PerMaterial instead of PerMaterialInstance

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-03-04 18:21:03 +08:00
parent ef8f630056
commit ba65d1abf2
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SceneGraph/Vulkan/VKMaterialInstance.cpp
View File

@@ -23,7 +23,7 @@ MaterialInstance::MaterialInstance(Material *mtl,VIL *v)
vil=v;
mp_per_mi=mtl->GetMP(DescriptorSetType::PerMaterialInstance);
mp_per_mi=mtl->GetMP(DescriptorSetType::PerMaterial);
}
bool MaterialInstance::BindUBO(const DescriptorSetType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic)

2
src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
View File

@@ -56,7 +56,7 @@ void LoadShaderDescriptor(io::ConstBufferReader &cbr,ShaderDescriptor *sd_list,c
if(ver==2) //以下是旧的，未来不用了，现仅保证能运行
{
if(sd->name[0]=='g')sd->set_type=DescriptorSetType::Global;else
if(sd->name[0]=='m')sd->set_type=DescriptorSetType::PerMaterialInstance;else
if(sd->name[0]=='m')sd->set_type=DescriptorSetType::PerMaterial;else
if(sd->name[0]=='r')sd->set_type=DescriptorSetType::PerObject;else
sd->set_type=DescriptorSetType::PerFrame;
}