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

将dev_attr从MaterialCreateConfig中移除改到最终的Create函数中。代码能编过，但是static自动注册失效了，待查。

Browse Source
This commit is contained in:
hyzboy
2025-05-16 09:12:33 +08:00
parent 4a4326826e
commit fd1a629941
26 changed files with 97 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/hgl/graph/mtl/MaterialLibrary.h
View File

@@ -27,7 +27,7 @@ public:
//virtual const CoordinateSystem2D get2DCoordinateSystem()const=0;
virtual MaterialCreateInfo *Create(MaterialCreateConfig *)=0;
virtual MaterialCreateInfo *Create(const GPUDeviceAttribute *dev_attr,MaterialCreateConfig *)=0;
};//class MaterialFactory
@@ -57,28 +57,28 @@ public:
return mtl_name; \
} \
\
MaterialCreateInfo *Create(MaterialCreateConfig *cfg) override \
MaterialCreateInfo *Create(const GPUDeviceAttribute *dev_attr,MaterialCreateConfig *cfg) override \
{ \
return create_func((cfg_type *)cfg); \
return create_func(dev_attr,(cfg_type *)cfg); \
} \
}; \
\
DEFINE_MATERIAL_FACTORY(name)
MaterialCreateInfo *CreateMaterialCreateInfo(const MaterialName &,MaterialCreateConfig *cfg);
MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const MaterialName &,MaterialCreateConfig *cfg);
inline MaterialCreateInfo *CreateMaterialCreateInfo(const char *mtl_name,MaterialCreateConfig *cfg)
inline MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const char *mtl_name,MaterialCreateConfig *cfg)
{
MaterialName mtl_id_name(mtl_name);
return CreateMaterialCreateInfo(mtl_id_name,cfg);
return CreateMaterialCreateInfo(dev_attr,mtl_id_name,cfg);
}
inline MaterialCreateInfo *CreateMaterialCreateInfo(const AnsiString &mtl_name,MaterialCreateConfig *cfg)
inline MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const AnsiString &mtl_name,MaterialCreateConfig *cfg)
{
MaterialName mtl_id_name(mtl_name);
return CreateMaterialCreateInfo(mtl_id_name,cfg);
return CreateMaterialCreateInfo(dev_attr,mtl_id_name,cfg);
}
STD_MTL_NAMESPACE_END