From ff015dfc5d7dafea13d393b5606df78af5340755 Mon Sep 17 00:00:00 2001
From: HuYingzhuo <hyzboy@gmail.com>
Date: Thu, 18 Apr 2019 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?ShaderCreater=E6=94=B9=E5=90=8D=E4=B8=BAShader?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E9=80=A0=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/Vulkan/VKShader.cpp |  5 ++---
 example/Vulkan/VKShader.h   | 14 +++++---------
 example/Vulkan/main.cpp     |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/example/Vulkan/VKShader.cpp b/example/Vulkan/VKShader.cpp
index 2cbf34ed..516d23b9 100644
--- a/example/Vulkan/VKShader.cpp
+++ b/example/Vulkan/VKShader.cpp
@@ -1,8 +1,7 @@
 #include"VKShader.h"
 
 VK_NAMESPACE_BEGIN
-
-ShaderCreater::~ShaderCreater()
+Shader::~Shader()
 {
     const int count=shader_stage_list.GetCount();
 
@@ -17,7 +16,7 @@ ShaderCreater::~ShaderCreater()
     }
 }
 
-bool ShaderCreater::Add(const VkShaderStageFlagBits shader_stage_bit,const void *spv_data,const uint32_t spv_size)
+bool Shader::Add(const VkShaderStageFlagBits shader_stage_bit,const void *spv_data,const uint32_t spv_size)
 {   
     VkPipelineShaderStageCreateInfo shader_stage;
     shader_stage.sType=VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
diff --git a/example/Vulkan/VKShader.h b/example/Vulkan/VKShader.h
index 5fca7675..37b6da3a 100644
--- a/example/Vulkan/VKShader.h
+++ b/example/Vulkan/VKShader.h
@@ -5,7 +5,7 @@ VK_NAMESPACE_BEGIN
 /**
  * Shader ´´½¨Æ÷
  */
-class ShaderCreater
+class Shader
 {
     VkDevice device;
 
@@ -13,8 +13,8 @@ class ShaderCreater
 
 public:
 
-    ShaderCreater(VkDevice dev):device(dev){}
-    ~ShaderCreater();
+    Shader(VkDevice dev):device(dev){}
+    ~Shader();
 
     bool Add(const VkShaderStageFlagBits shader_stage_bit,const void *spv_data,const uint32_t spv_size);
 
@@ -43,11 +43,7 @@ public:
         shader_stage_list.Clear();
     }
 
-    bool Finish(List<VkPipelineShaderStageCreateInfo> &pss_list)
-    {
-        pss_list=shader_stage_list;
-
-        Clear();
-    }
+    const uint32_t                          GetCount        ()const{return shader_stage_list.GetCount();}
+    const VkPipelineShaderStageCreateInfo * GetShaderStages ()const{return shader_stage_list.GetData();}
 };//class ShaderCreater
 VK_NAMESPACE_END
diff --git a/example/Vulkan/main.cpp b/example/Vulkan/main.cpp
index a7f43483..ffed6953 100644
--- a/example/Vulkan/main.cpp
+++ b/example/Vulkan/main.cpp
@@ -34,7 +34,7 @@ char *LoadFile(const char *filename,uint32_t &file_length)
     return data;
 }
 
-bool LoadShader(vulkan::ShaderCreater *sc,const char *filename,VkShaderStageFlagBits shader_flag)
+bool LoadShader(vulkan::Shader *sc,const char *filename,VkShaderStageFlagBits shader_flag)
 {
     uint32_t size;
     char *data=LoadFile(filename,size);
@@ -51,7 +51,7 @@ bool LoadShader(vulkan::ShaderCreater *sc,const char *filename,VkShaderStageFlag
 
 bool LoadShader(VkDevice device)
 {
-    vulkan::ShaderCreater sc(device);
+    vulkan::Shader sc(device);
 
     if(!LoadShader(&sc,"FlatColor.vert.spv",VK_SHADER_STAGE_VERTEX_BIT))
         return(false);