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

ShaderCreater改名为Shader，改造返回值处理函数

Browse Source
This commit is contained in:
HuYingzhuo 2019-04-18 16:18:05 +08:00
parent 436da3f5b0
commit ff015dfc5d
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/Vulkan/VKShader.cpp
View File

@ -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;

14
example/Vulkan/VKShader.h
View File

@ -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

4
example/Vulkan/main.cpp
View File

@ -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);