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

completed AutoMergeMaterialInstance,test ok. next step is to support texture2d array

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-09-20 21:53:30 +08:00
parent ddb5a0b77a
commit 6820ee8c74
12 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inc/hgl/graph/VKMaterial.h
View File

@@ -70,13 +70,14 @@ public:
const bool hasSet (const DescriptorSetType &type)const;
const VIL * GetDefaultVIL()const;
VIL * CreateVIL(const VILConfig *format_map=nullptr);
bool Release(VIL *);
const uint GetVILCount();
public:
const bool HasMI ()const{return !mi_data_bytes;}
const bool HasMI ()const{return mi_data_bytes>0;}
const uint32_t GetMIDataBytes ()const{return mi_data_bytes;}
const uint32_t GetMIMaxCount ()const{return mi_max_count;}

4
inc/hgl/graph/VKRenderPass.h
View File

@@ -53,9 +53,13 @@ public:
const VkExtent2D & GetGranularity()const{return granularity;}
public:
Pipeline *CreatePipeline(Material *,const VIL *,const PipelineData *, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(Material *,const VIL *,const InlinePipeline &, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(Material *mtl, const PipelineData *, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(Material *mtl, const InlinePipeline &, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(MaterialInstance *, const InlinePipeline &, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(MaterialInstance *, const PipelineData *, const Prim &,const bool prim_restart=false);
Pipeline *CreatePipeline(MaterialInstance *, const OSString &, const Prim &,const bool prim_restart=false);

2
inc/hgl/graph/mtl/UBOCommon.h
View File

@@ -56,7 +56,7 @@ constexpr const ShaderBufferSource SBS_LocalToWorld=
constexpr const char MaterialInstanceStruct[]="MaterialInstance";
constexpr const ShaderBufferSource SBS_MaterialInstanceData=
constexpr const ShaderBufferSource SBS_MaterialInstance=
{
"MaterialInstanceData",
"mtl",