material增加定义

This commit is contained in:
hyzboy 2019-04-27 02:07:06 +08:00
parent 176d966159
commit 6a05317d4c
2 changed files with 12 additions and 6 deletions

View File

@ -3,8 +3,16 @@
#include"VKShader.h" #include"VKShader.h"
#include"VKVertexAttributeBinding.h" #include"VKVertexAttributeBinding.h"
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
Material::Material(Device *dev,Shader *s)
{
device=dev;
shader=s;
dsl_creater=new DescriptorSetLayoutCreater(dev);
}
Material::~Material() Material::~Material()
{ {
delete dsl_creater;
delete shader; delete shader;
} }

View File

@ -6,6 +6,7 @@ VK_NAMESPACE_BEGIN
class Device; class Device;
class Shader; class Shader;
class DescriptorSetLayoutCreater; class DescriptorSetLayoutCreater;
class DescriptorSetLayout;
class MaterialInstance; class MaterialInstance;
class VertexAttributeBinding; class VertexAttributeBinding;
@ -17,14 +18,11 @@ class Material
{ {
Device *device; Device *device;
Shader *shader; Shader *shader;
DescriptorSetLayoutCreater *dsl_creater;
public: public:
Material(Device *dev,Shader *s) Material(Device *dev,Shader *s);
{
device=dev;
shader=s;
}
~Material(); ~Material();
MaterialInstance *CreateInstance(); MaterialInstance *CreateInstance();
@ -38,7 +36,7 @@ class MaterialInstance
{ {
const Material *mat; ///<这里的是对material的完全引用不做任何修改 const Material *mat; ///<这里的是对material的完全引用不做任何修改
VertexAttributeBinding *vab; VertexAttributeBinding *vab;
DescriptorSetLayoutCreater *dsl_creater; DescriptorSetLayout *desc_set_layout;
public: public: