From 6a05317d4c7222542d6ac2f3addcdaaa5cb4a654 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sat, 27 Apr 2019 02:07:06 +0800
Subject: [PATCH] =?UTF-8?q?material=E5=A2=9E=E5=8A=A0=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/Vulkan/VKMaterial.cpp |  8 ++++++++
 example/Vulkan/VKMaterial.h   | 10 ++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/example/Vulkan/VKMaterial.cpp b/example/Vulkan/VKMaterial.cpp
index 15c516ae..24a280a7 100644
--- a/example/Vulkan/VKMaterial.cpp
+++ b/example/Vulkan/VKMaterial.cpp
@@ -3,8 +3,16 @@
 #include"VKShader.h"
 #include"VKVertexAttributeBinding.h"
 VK_NAMESPACE_BEGIN
+Material::Material(Device *dev,Shader *s)
+{
+    device=dev;
+    shader=s;
+    dsl_creater=new DescriptorSetLayoutCreater(dev);
+}
+
 Material::~Material()
 {
+    delete dsl_creater;
     delete shader;
 }
 
diff --git a/example/Vulkan/VKMaterial.h b/example/Vulkan/VKMaterial.h
index b8644937..e642094c 100644
--- a/example/Vulkan/VKMaterial.h
+++ b/example/Vulkan/VKMaterial.h
@@ -6,6 +6,7 @@ VK_NAMESPACE_BEGIN
 class Device;
 class Shader;
 class DescriptorSetLayoutCreater;
+class DescriptorSetLayout;
 class MaterialInstance;
 class VertexAttributeBinding;
 
@@ -17,14 +18,11 @@ class Material
 {
     Device *device;
     Shader *shader;
+    DescriptorSetLayoutCreater *dsl_creater;
 
 public:
 
-    Material(Device *dev,Shader *s)
-    {
-        device=dev;
-        shader=s;
-    }
+    Material(Device *dev,Shader *s);
     ~Material();
 
     MaterialInstance *CreateInstance();
@@ -38,7 +36,7 @@ class MaterialInstance
 {
     const Material *mat;                                                                            ///<这里的是对material的完全引用，不做任何修改
     VertexAttributeBinding *vab;
-    DescriptorSetLayoutCreater *dsl_creater;
+    DescriptorSetLayout *desc_set_layout;
 
 public: