few about MaterialInstance
This commit is contained in:
@@ -109,11 +109,12 @@ bool RenderCmdBuffer::BindDescriptorSets(Renderable *ri)
|
||||
uint32_t count=0;
|
||||
|
||||
MaterialParameters *mp;
|
||||
Material *mtl=ri->GetMaterial();
|
||||
VkDescriptorSet ds[DESCRIPTOR_SET_TYPE_COUNT];
|
||||
|
||||
ENUM_CLASS_FOR(DescriptorSetType,int,i)
|
||||
{
|
||||
mp=ri->GetMP((DescriptorSetType)i);
|
||||
mp=mtl->GetMP((DescriptorSetType)i);
|
||||
|
||||
if(mp)
|
||||
{
|
||||
|
@@ -3,12 +3,12 @@
|
||||
#include<hgl/graph/VKMaterialInstance.h>
|
||||
|
||||
VK_NAMESPACE_BEGIN
|
||||
bool DescriptorBinding::Bind(MaterialInstance *mi)
|
||||
bool DescriptorBinding::Bind(Material *mtl)
|
||||
{
|
||||
if(!mi)
|
||||
if(!mtl)
|
||||
return(false);
|
||||
|
||||
MaterialParameters *mp=mi->GetMP(set_type);
|
||||
MaterialParameters *mp=mtl->GetMP(set_type);
|
||||
|
||||
if(!mp)
|
||||
return(false);
|
||||
|
@@ -22,7 +22,7 @@ MaterialInstance::MaterialInstance(Material *mtl,VIL *v)
|
||||
|
||||
bool MaterialInstance::BindUBO(const DescriptorSetType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic)
|
||||
{
|
||||
MaterialParameters *mp=GetMP(type);
|
||||
MaterialParameters *mp=material->GetMP(type);
|
||||
|
||||
if(!mp)
|
||||
return(false);
|
||||
@@ -35,7 +35,7 @@ bool MaterialInstance::BindUBO(const DescriptorSetType &type,const AnsiString &n
|
||||
|
||||
bool MaterialInstance::BindSSBO(const DescriptorSetType &type,const AnsiString &name,DeviceBuffer *ubo,bool dynamic)
|
||||
{
|
||||
MaterialParameters *mp=GetMP(type);
|
||||
MaterialParameters *mp=material->GetMP(type);
|
||||
|
||||
if(!mp)
|
||||
return(false);
|
||||
@@ -48,7 +48,7 @@ bool MaterialInstance::BindSSBO(const DescriptorSetType &type,const AnsiString &
|
||||
|
||||
bool MaterialInstance::BindImageSampler(const DescriptorSetType &type,const AnsiString &name,Texture *tex,Sampler *sampler)
|
||||
{
|
||||
MaterialParameters *mp=GetMP(type);
|
||||
MaterialParameters *mp=material->GetMP(type);
|
||||
|
||||
if(!mp)
|
||||
return(false);
|
||||
|
Reference in New Issue
Block a user