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

upgraded to newly DescriptorSetType

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-02-22 21:50:18 +08:00
parent 95064488db
commit b35ef27610
17 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
#include<hgl/graph/VKDevice.h>
#include<hgl/graph/VKMaterialInstance.h>
#include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKMaterialParameters.h>
#include<hgl/graph/VKShaderModule.h>
@@ -15,72 +14,54 @@ MaterialInstance *GPUDevice::CreateMI(Material *mtl,const VILConfig *vil_cfg)
if(!vil)return(nullptr);
MaterialParameters *mp=CreateMP(mtl,DescriptorSetsType::Value);
return(new MaterialInstance(mtl,vil,mp));
return(new MaterialInstance(mtl,vil));
}
MaterialInstance::MaterialInstance(Material *mtl,VIL *v,MaterialParameters *p)
MaterialInstance::MaterialInstance(Material *mtl,VIL *v)
{
material=mtl;
vil=v;
mp_value=p;
}
MaterialInstance::~MaterialInstance()
{
SAFE_CLEAR(mp_value);
}
MaterialParameters *MaterialInstance::GetMP(const DescriptorSetsType &type)
{
//if(type==DescriptorSetsType::Texture
// return mp_texture;
if(type==DescriptorSetsType::Value)
return mp_value;
return material->GetMP(type);
mp_per_mi=mtl->GetMP(DescriptorSetsType::PerMaterial);
}
bool MaterialInstance::BindUBO(const DescriptorSetsType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic)
{
MaterialParameters *mp_global=GetMP(type);
MaterialParameters *mp=GetMP(type);
if(!mp_global)
if(!mp)
return(false);
if(!mp_global->BindUBO(name,ubo,dynamic))return(false);
if(!mp->BindUBO(name,ubo,dynamic))return(false);
mp_global->Update();
mp->Update();
return(true);
}
bool MaterialInstance::BindSSBO(const DescriptorSetsType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic)
{
MaterialParameters *mp_global=GetMP(type);
MaterialParameters *mp=GetMP(type);
if(!mp_global)
if(!mp)
return(false);
if(!mp_global->BindSSBO(name,ubo,dynamic))return(false);
if(!mp->BindSSBO(name,ubo,dynamic))return(false);
mp_global->Update();
mp->Update();
return(true);
}
bool MaterialInstance::BindSampler(const DescriptorSetsType &type,const AnsiString &name,Texture *tex,Sampler *sampler)
{
MaterialParameters *mp_global=GetMP(type);
MaterialParameters *mp=GetMP(type);
if(!mp_global)
if(!mp)
return(false);
if(!mp_global->BindSampler(name,tex,sampler))return(false);
if(!mp->BindSampler(name,tex,sampler))return(false);
mp_global->Update();
mp->Update();
return(true);
}
VK_NAMESPACE_END