From 555e8fc0667f84c4beee9f8f2bab52a58edfe3e4 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 17 Mar 2023 10:08:41 +0800 Subject: [PATCH] renamed many source of ShaderGen --- example/MaterialCreaterTest.cpp | 14 +++---- ...MaterialCreater.h => MaterialCreateInfo.h} | 30 +++++++-------- .../{ShaderCreater.h => ShaderCreateInfo.h} | 18 ++++----- inc/hgl/shadergen/ShaderCreateInfoFragment.h | 22 +++++++++++ inc/hgl/shadergen/ShaderCreateInfoGeometry.h | 13 +++++++ inc/hgl/shadergen/ShaderCreateInfoMap.h | 25 ++++++++++++ inc/hgl/shadergen/ShaderCreateInfoVertex.h | 18 +++++++++ inc/hgl/shadergen/ShaderCreaterFragment.h | 22 ----------- inc/hgl/shadergen/ShaderCreaterGeometry.h | 13 ------- inc/hgl/shadergen/ShaderCreaterMap.h | 25 ------------ inc/hgl/shadergen/ShaderCreaterVertex.h | 18 --------- inc/hgl/shadergen/StandardMaterial.h | 2 +- src/ShaderGen/CMakeLists.txt | 38 +++++++++---------- ...rialCreater.cpp => MaterialCreateInfo.cpp} | 24 ++++++------ ...ShaderCreater.cpp => ShaderCreateInfo.cpp} | 30 +++++++-------- ...gment.cpp => ShaderCreateInfoFragment.cpp} | 6 +-- ...metry.cpp => ShaderCreateInfoGeometry.cpp} | 0 ...rVertex.cpp => ShaderCreateInfoVertex.cpp} | 8 ++-- 18 files changed, 163 insertions(+), 163 deletions(-) rename inc/hgl/shadergen/{MaterialCreater.h => MaterialCreateInfo.h} (66%) rename inc/hgl/shadergen/{ShaderCreater.h => ShaderCreateInfo.h} (76%) create mode 100644 inc/hgl/shadergen/ShaderCreateInfoFragment.h create mode 100644 inc/hgl/shadergen/ShaderCreateInfoGeometry.h create mode 100644 inc/hgl/shadergen/ShaderCreateInfoMap.h create mode 100644 inc/hgl/shadergen/ShaderCreateInfoVertex.h delete mode 100644 inc/hgl/shadergen/ShaderCreaterFragment.h delete mode 100644 inc/hgl/shadergen/ShaderCreaterGeometry.h delete mode 100644 inc/hgl/shadergen/ShaderCreaterMap.h delete mode 100644 inc/hgl/shadergen/ShaderCreaterVertex.h rename src/ShaderGen/{MaterialCreater.cpp => MaterialCreateInfo.cpp} (64%) rename src/ShaderGen/{ShaderCreater.cpp => ShaderCreateInfo.cpp} (87%) rename src/ShaderGen/{ShaderCreaterFragment.cpp => ShaderCreateInfoFragment.cpp} (87%) rename src/ShaderGen/{ShaderCreaterGeometry.cpp => ShaderCreateInfoGeometry.cpp} (100%) rename src/ShaderGen/{ShaderCreaterVertex.cpp => ShaderCreateInfoVertex.cpp} (81%) diff --git a/example/MaterialCreaterTest.cpp b/example/MaterialCreaterTest.cpp index 92533250..81153315 100644 --- a/example/MaterialCreaterTest.cpp +++ b/example/MaterialCreaterTest.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace hgl; using namespace hgl::graph; @@ -6,11 +6,11 @@ using namespace hgl::shadergen; bool PureColor2DMaterial() { - MaterialCreater mc(1,false); //一个新材质，1个RT输出，默认使用Vertex/Fragment shader + MaterialCreateInfo mc(1,false); //一个新材质，1个RT输出，默认使用Vertex/Fragment shader //vertex部分 { - ShaderCreaterVertex *vsc=mc.GetVS(); //获取vertex shader creater + ShaderCreateInfoVertex *vsc=mc.GetVS(); //获取vertex shader creater //以下代码会被展开为 /* @@ -46,7 +46,7 @@ void main() //fragment部分 { - ShaderCreaterFragment *fsc=mc.GetFS(); //获取fragment shader creater + ShaderCreateInfoFragment *fsc=mc.GetFS(); //获取fragment shader creater //以下代码会被展开为 /* @@ -68,11 +68,11 @@ void main() bool VertexColor2DMaterial() { - MaterialCreater mc(1,false); + MaterialCreateInfo mc(1,false); //vertex部分 { - ShaderCreaterVertex *vsc=mc.GetVS(); + ShaderCreateInfoVertex *vsc=mc.GetVS(); vsc->AddInput("vec2","Position"); vsc->AddInput("vec4","Color"); @@ -90,7 +90,7 @@ void main() //fragment部分 { - ShaderCreaterFragment *fsc=mc.GetFS(); + ShaderCreateInfoFragment *fsc=mc.GetFS(); fsc->AddOutput("vec4","Color"); diff --git a/inc/hgl/shadergen/MaterialCreater.h b/inc/hgl/shadergen/MaterialCreateInfo.h similarity index 66% rename from inc/hgl/shadergen/MaterialCreater.h rename to inc/hgl/shadergen/MaterialCreateInfo.h index 4834774b..27c93a71 100644 --- a/inc/hgl/shadergen/MaterialCreater.h +++ b/inc/hgl/shadergen/MaterialCreateInfo.h @@ -1,14 +1,14 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #include SHADERGEN_NAMESPACE_BEGIN -class MaterialCreater +class MaterialCreateInfo { protected: @@ -19,11 +19,11 @@ protected: MaterialDescriptorManager mdm; ///<材质描述符管理器 - ShaderCreaterMap shader_map; ///<着色器列表 + ShaderCreateInfoMap shader_map; ///<着色器列表 - ShaderCreaterVertex *vert; - ShaderCreaterGeometry *geom; - ShaderCreaterFragment *frag; + ShaderCreateInfoVertex *vert; + ShaderCreateInfoGeometry *geom; + ShaderCreateInfoFragment *frag; public: @@ -36,14 +36,14 @@ public: bool hasFragment()const{return hasShader(VK_SHADER_STAGE_FRAGMENT_BIT);} // bool hasCompute ()const{return hasShader(VK_SHADER_STAGE_COMPUTE_BIT);} - ShaderCreaterVertex * GetVS(){return vert;} - ShaderCreaterGeometry * GetGS(){return geom;} - ShaderCreaterFragment * GetFS(){return frag;} + ShaderCreateInfoVertex * GetVS(){return vert;} + ShaderCreateInfoGeometry * GetGS(){return geom;} + ShaderCreateInfoFragment * GetFS(){return frag;} public: - MaterialCreater(const uint rc,const bool rd,const uint32 ss=VK_SHADER_STAGE_VERTEX_BIT|VK_SHADER_STAGE_FRAGMENT_BIT); - ~MaterialCreater()=default; + MaterialCreateInfo(const uint rc,const bool rd,const uint32 ss=VK_SHADER_STAGE_VERTEX_BIT|VK_SHADER_STAGE_FRAGMENT_BIT); + ~MaterialCreateInfo()=default; bool AddStruct(const AnsiString &ubo_typename,const AnsiString &codes); @@ -51,5 +51,5 @@ public: bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name); bool CreateShader(); -};//class MaterialCreater +};//class MaterialCreateInfo SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/ShaderCreater.h b/inc/hgl/shadergen/ShaderCreateInfo.h similarity index 76% rename from inc/hgl/shadergen/ShaderCreater.h rename to inc/hgl/shadergen/ShaderCreateInfo.h index 9d9d02a1..a76f688c 100644 --- a/inc/hgl/shadergen/ShaderCreater.h +++ b/inc/hgl/shadergen/ShaderCreateInfo.h @@ -1,5 +1,5 @@ -#ifndef HGL_SHADER_CREATER_INCLUDE -#define HGL_SHADER_CREATER_INCLUDE +#ifndef HGL_SHADER_CREATE_INFO_INCLUDE +#define HGL_SHADER_CREATE_INFO_INCLUDE #include #include @@ -8,7 +8,7 @@ SHADERGEN_NAMESPACE_BEGIN class MaterialDescriptorManager; class ShaderDescriptorManager; -class ShaderCreater +class ShaderCreateInfo { protected: @@ -28,7 +28,7 @@ protected: virtual bool ProcHeader(){return(true);} virtual bool ProcSubpassInput(); - virtual bool ProcInput(ShaderCreater *); + virtual bool ProcInput(ShaderCreateInfo *); virtual bool ProcOutput(); virtual bool ProcStruct(); @@ -48,8 +48,8 @@ public: public: - ShaderCreater(VkShaderStageFlagBits ss,MaterialDescriptorManager *m); - virtual ~ShaderCreater(); + ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m); + virtual ~ShaderCreateInfo(); int AddOutput(const graph::VAT &type,const AnsiString &name); int AddOutput(const AnsiString &type,const AnsiString &name); @@ -62,7 +62,7 @@ public: const AnsiString &GetOutputStruct()const{return output_struct;} const AnsiString &GetShaderSource()const{return final_shader;} - bool CreateShader(ShaderCreater *); -};//class ShaderCreater + bool CreateShader(ShaderCreateInfo *); +};//class ShaderCreateInfo SHADERGEN_NAMESPACE_END -#endif//HGL_SHADER_CREATER_INCLUDE +#endif//HGL_SHADER_CREATE_INFO_INCLUDE diff --git a/inc/hgl/shadergen/ShaderCreateInfoFragment.h b/inc/hgl/shadergen/ShaderCreateInfoFragment.h new file mode 100644 index 00000000..4b45b082 --- /dev/null +++ b/inc/hgl/shadergen/ShaderCreateInfoFragment.h @@ -0,0 +1,22 @@ +#pragma once + +#include + +SHADERGEN_NAMESPACE_BEGIN +enum class MaterialType +{ + Color, ///<ɫ +}; + +class ShaderCreateInfoFragment:public ShaderCreateInfo +{ + bool ProcOutput() override; + +public: + + ShaderCreateInfoFragment(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){} + ~ShaderCreateInfoFragment()=default; + + void UseDefaultMain(); +}; +SHADERGEN_NAMESPACE_END \ No newline at end of file diff --git a/inc/hgl/shadergen/ShaderCreateInfoGeometry.h b/inc/hgl/shadergen/ShaderCreateInfoGeometry.h new file mode 100644 index 00000000..2d304600 --- /dev/null +++ b/inc/hgl/shadergen/ShaderCreateInfoGeometry.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +SHADERGEN_NAMESPACE_BEGIN +class ShaderCreateInfoGeometry:public ShaderCreateInfo +{ +public: + + ShaderCreateInfoGeometry(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){} + ~ShaderCreateInfoGeometry()=default; +}; +SHADERGEN_NAMESPACE_END \ No newline at end of file diff --git a/inc/hgl/shadergen/ShaderCreateInfoMap.h b/inc/hgl/shadergen/ShaderCreateInfoMap.h new file mode 100644 index 00000000..84f5f18d --- /dev/null +++ b/inc/hgl/shadergen/ShaderCreateInfoMap.h @@ -0,0 +1,25 @@ +#pragma once + +#include + +SHADERGEN_NAMESPACE_BEGIN +class ShaderCreateInfoMap:public ObjectMap +{ +public: + + using ObjectMap::ObjectMap; + + bool Add(ShaderCreateInfo *sc) + { + if(!sc)return(false); + + VkShaderStageFlagBits flag=sc->GetShaderStage(); + + if(KeyExist(flag)) + return(false); + + ObjectMap::Add(flag,sc); + return(true); + } +}; +SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/ShaderCreateInfoVertex.h b/inc/hgl/shadergen/ShaderCreateInfoVertex.h new file mode 100644 index 00000000..5b2fa39e --- /dev/null +++ b/inc/hgl/shadergen/ShaderCreateInfoVertex.h @@ -0,0 +1,18 @@ +#pragma once + +#include + +SHADERGEN_NAMESPACE_BEGIN +class ShaderCreateInfoVertex:public ShaderCreateInfo +{ + bool ProcInput(ShaderCreateInfo *) override; + +public: + + ShaderCreateInfoVertex(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){} + ~ShaderCreateInfoVertex()=default; + + int AddInput(const graph::VAT &type,const AnsiString &name); + int AddInput(const AnsiString &type,const AnsiString &name); +}; +SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/ShaderCreaterFragment.h b/inc/hgl/shadergen/ShaderCreaterFragment.h deleted file mode 100644 index 6f90db14..00000000 --- a/inc/hgl/shadergen/ShaderCreaterFragment.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include - -SHADERGEN_NAMESPACE_BEGIN -enum class MaterialType -{ - Color, ///<ɫ -}; - -class ShaderCreaterFragment:public ShaderCreater -{ - bool ProcOutput() override; - -public: - - ShaderCreaterFragment(MaterialDescriptorManager *m):ShaderCreater(VK_SHADER_STAGE_FRAGMENT_BIT,m){} - ~ShaderCreaterFragment()=default; - - void UseDefaultMain(); -}; -SHADERGEN_NAMESPACE_END \ No newline at end of file diff --git a/inc/hgl/shadergen/ShaderCreaterGeometry.h b/inc/hgl/shadergen/ShaderCreaterGeometry.h deleted file mode 100644 index 086298c6..00000000 --- a/inc/hgl/shadergen/ShaderCreaterGeometry.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -SHADERGEN_NAMESPACE_BEGIN -class ShaderCreaterGeometry:public ShaderCreater -{ -public: - - ShaderCreaterGeometry(MaterialDescriptorManager *m):ShaderCreater(VK_SHADER_STAGE_GEOMETRY_BIT,m){} - ~ShaderCreaterGeometry()=default; -}; -SHADERGEN_NAMESPACE_END \ No newline at end of file diff --git a/inc/hgl/shadergen/ShaderCreaterMap.h b/inc/hgl/shadergen/ShaderCreaterMap.h deleted file mode 100644 index 08042467..00000000 --- a/inc/hgl/shadergen/ShaderCreaterMap.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -SHADERGEN_NAMESPACE_BEGIN -class ShaderCreaterMap:public ObjectMap -{ -public: - - using ObjectMap::ObjectMap; - - bool Add(ShaderCreater *sc) - { - if(!sc)return(false); - - VkShaderStageFlagBits flag=sc->GetShaderStage(); - - if(KeyExist(flag)) - return(false); - - ObjectMap::Add(flag,sc); - return(true); - } -}; -SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/ShaderCreaterVertex.h b/inc/hgl/shadergen/ShaderCreaterVertex.h deleted file mode 100644 index 27a31827..00000000 --- a/inc/hgl/shadergen/ShaderCreaterVertex.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include - -SHADERGEN_NAMESPACE_BEGIN -class ShaderCreaterVertex:public ShaderCreater -{ - bool ProcInput(ShaderCreater *) override; - -public: - - ShaderCreaterVertex(MaterialDescriptorManager *m):ShaderCreater(VK_SHADER_STAGE_VERTEX_BIT,m){} - ~ShaderCreaterVertex()=default; - - int AddInput(const graph::VAT &type,const AnsiString &name); - int AddInput(const AnsiString &type,const AnsiString &name); -}; -SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/StandardMaterial.h b/inc/hgl/shadergen/StandardMaterial.h index 36480299..9cb540c7 100644 --- a/inc/hgl/shadergen/StandardMaterial.h +++ b/inc/hgl/shadergen/StandardMaterial.h @@ -102,7 +102,7 @@ public: } };//struct Standard2DMaterial:public StandardMaterial -class MaterialCreater; +class MaterialCreateInfo; Material *CreateMaterial() { diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt index 61ae1242..7b4bbdcc 100644 --- a/src/ShaderGen/CMakeLists.txt +++ b/src/ShaderGen/CMakeLists.txt @@ -1,25 +1,25 @@ set(SHADERGEN_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl/shadergen) -SET(SHADER_CREATER_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/ShaderCreater.h - ${SHADERGEN_INCLUDE_PATH}/ShaderCreaterMap.h - ${SHADERGEN_INCLUDE_PATH}/ShaderCreaterVertex.h - ${SHADERGEN_INCLUDE_PATH}/ShaderCreaterGeometry.h - ${SHADERGEN_INCLUDE_PATH}/ShaderCreaterFragment.h) +SET(SHADER_CREATER_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/ShaderCreateInfo.h + ${SHADERGEN_INCLUDE_PATH}/ShaderCreateInfoMap.h + ${SHADERGEN_INCLUDE_PATH}/ShaderCreateInfoVertex.h + ${SHADERGEN_INCLUDE_PATH}/ShaderCreateInfoGeometry.h + ${SHADERGEN_INCLUDE_PATH}/ShaderCreateInfoFragment.h) -SET(SHADER_CREATER_SOURCE_FILES ShaderCreater.cpp - ShaderCreaterVertex.cpp - ShaderCreaterGeometry.cpp - ShaderCreaterFragment.cpp) +SET(SHADER_CREATER_SOURCE_FILES ShaderCreateInfo.cpp + ShaderCreateInfoVertex.cpp + ShaderCreateInfoGeometry.cpp + ShaderCreateInfoFragment.cpp) -SOURCE_GROUP("Material Creater\\Shader Creater" FILES ${SHADER_CREATER_HEADER_FILES} - ${SHADER_CREATER_SOURCE_FILES}) +SOURCE_GROUP("Material Create Info\\Shader" FILES ${SHADER_CREATER_HEADER_FILES} + ${SHADER_CREATER_SOURCE_FILES}) -SET(MATERIAL_CREATER_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/MaterialCreater.h) -SET(MATERIAL_CREATER_SOURCE_FILES MaterialCreater.cpp) +SET(MATERIAL_CREATE_INFO_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/MaterialCreateInfo.h) +SET(MATERIAL_CREATE_INFO_SOURCE_FILES MaterialCreateInfo.cpp) -SOURCE_GROUP("Material Creater" FILES ${MATERIAL_CREATER_HEADER_FILES} - ${MATERIAL_CREATER_SOURCE_FILES}) +SOURCE_GROUP("Material Create Info" FILES ${MATERIAL_CREATE_INFO_HEADER_FILES} + ${MATERIAL_CREATE_INFO_SOURCE_FILES}) SET(SHADERGEN_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/ShaderGenNamespace.h ${SHADERGEN_INCLUDE_PATH}/ShaderDescriptorManager.h @@ -37,8 +37,8 @@ SET(GLSL_COMPILER_SOURCE GLSLCompiler.h SOURCE_GROUP("GLSL Compiler" FILES ${GLSL_COMPILER_SOURCE}) -SOURCE_GROUP("Material Creater\\DescriptorManager" FILES ${SHADERGEN_HEADER_FILES} - ${SHADERGEN_SOURCE_FILES}) +SOURCE_GROUP("Material Create Info\\Descriptor Manager" FILES ${SHADERGEN_HEADER_FILES} + ${SHADERGEN_SOURCE_FILES}) SET(STANDARD_MATERIAL_SOURCE ${SHADERGEN_INCLUDE_PATH}/StandardMaterial.h StandardMaterial.cpp) @@ -47,8 +47,8 @@ SOURCE_GROUP("Standard Material" FILES ${STANDARD_MATERIAL_SOURCE}) add_cm_library(ULRE.ShaderGen "ULRE" ${SHADERGEN_HEADER_FILES} ${SHADERGEN_SOURCE_FILES} - ${MATERIAL_CREATER_HEADER_FILES} - ${MATERIAL_CREATER_SOURCE_FILES} + ${MATERIAL_CREATE_INFO_HEADER_FILES} + ${MATERIAL_CREATE_INFO_SOURCE_FILES} ${SHADER_CREATER_HEADER_FILES} ${SHADER_CREATER_SOURCE_FILES} ${GLSL_COMPILER_SOURCE} diff --git a/src/ShaderGen/MaterialCreater.cpp b/src/ShaderGen/MaterialCreateInfo.cpp similarity index 64% rename from src/ShaderGen/MaterialCreater.cpp rename to src/ShaderGen/MaterialCreateInfo.cpp index b7dffafb..2c35d464 100644 --- a/src/ShaderGen/MaterialCreater.cpp +++ b/src/ShaderGen/MaterialCreateInfo.cpp @@ -1,23 +1,23 @@ -#include +#include #include using namespace hgl; using namespace hgl::graph; SHADERGEN_NAMESPACE_BEGIN -MaterialCreater::MaterialCreater(const uint rc,const bool rd,const uint32 ss) +MaterialCreateInfo::MaterialCreateInfo(const uint rc,const bool rd,const uint32 ss) { rt_color_count=rc; rt_depth=rd; shader_stage=ss; - if(hasVertex ())shader_map.Add(vert=new ShaderCreaterVertex (&mdm));else vert=nullptr; - if(hasGeometry ())shader_map.Add(geom=new ShaderCreaterGeometry(&mdm));else geom=nullptr; - if(hasFragment ())shader_map.Add(frag=new ShaderCreaterFragment(&mdm));else frag=nullptr; + if(hasVertex ())shader_map.Add(vert=new ShaderCreateInfoVertex (&mdm));else vert=nullptr; + if(hasGeometry ())shader_map.Add(geom=new ShaderCreateInfoGeometry(&mdm));else geom=nullptr; + if(hasFragment ())shader_map.Add(frag=new ShaderCreateInfoFragment(&mdm));else frag=nullptr; } -bool MaterialCreater::AddStruct(const AnsiString &struct_name,const AnsiString &codes) +bool MaterialCreateInfo::AddStruct(const AnsiString &struct_name,const AnsiString &codes) { if(struct_name.IsEmpty()||codes.IsEmpty()) return(false); @@ -25,7 +25,7 @@ bool MaterialCreater::AddStruct(const AnsiString &struct_name,const AnsiString & return mdm.AddStruct(struct_name,codes); } -bool MaterialCreater::AddUBO(const VkShaderStageFlagBits flag_bit,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name) +bool MaterialCreateInfo::AddUBO(const VkShaderStageFlagBits flag_bit,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name) { if(!shader_map.KeyExist(flag_bit)) return(false); @@ -33,7 +33,7 @@ bool MaterialCreater::AddUBO(const VkShaderStageFlagBits flag_bit,const Descript if(!mdm.hasStruct(type_name)) return(false); - ShaderCreater *sc=shader_map[flag_bit]; + ShaderCreateInfo *sc=shader_map[flag_bit]; if(!sc) return(false); @@ -60,14 +60,14 @@ bool MaterialCreater::AddUBO(const VkShaderStageFlagBits flag_bit,const Descript } } -bool MaterialCreater::AddSampler(const VkShaderStageFlagBits flag_bit,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name) +bool MaterialCreateInfo::AddSampler(const VkShaderStageFlagBits flag_bit,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name) { if(!shader_map.KeyExist(flag_bit)) return(false); RANGE_CHECK_RETURN_FALSE(st); - ShaderCreater *sc=shader_map[flag_bit]; + ShaderCreateInfo *sc=shader_map[flag_bit]; if(!sc) return(false); @@ -96,14 +96,14 @@ bool MaterialCreater::AddSampler(const VkShaderStageFlagBits flag_bit,const Desc } } -bool MaterialCreater::CreateShader() +bool MaterialCreateInfo::CreateShader() { if(shader_map.IsEmpty()) return(false); mdm.Resort(); - ShaderCreater *sc,*last=nullptr; + ShaderCreateInfo *sc,*last=nullptr; for(int i=0;i +#include #include #include"GLSLCompiler.h" SHADERGEN_NAMESPACE_BEGIN -ShaderCreater::ShaderCreater(VkShaderStageFlagBits ss,MaterialDescriptorManager *m) +ShaderCreateInfo::ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m) { shader_stage=ss; mdm=m; sdm=new ShaderDescriptorManager(ss); } -ShaderCreater::~ShaderCreater() +ShaderCreateInfo::~ShaderCreateInfo() { delete sdm; } -int ShaderCreater::AddOutput(const VAT &type,const AnsiString &name) +int ShaderCreateInfo::AddOutput(const VAT &type,const AnsiString &name) { ShaderStage *ss=new ShaderStage; @@ -27,7 +27,7 @@ int ShaderCreater::AddOutput(const VAT &type,const AnsiString &name) return sdm->AddOutput(ss); } -int ShaderCreater::AddOutput(const AnsiString &type,const AnsiString &name) +int ShaderCreateInfo::AddOutput(const AnsiString &type,const AnsiString &name) { VAT vat; @@ -40,7 +40,7 @@ int ShaderCreater::AddOutput(const AnsiString &type,const AnsiString &name) return AddOutput(vat,name); } -bool ShaderCreater::ProcSubpassInput() +bool ShaderCreateInfo::ProcSubpassInput() { auto sil=sdm->GetSubpassInputList(); @@ -68,7 +68,7 @@ bool ShaderCreater::ProcSubpassInput() return(true); } -bool ShaderCreater::ProcInput(ShaderCreater *last_sc) +bool ShaderCreateInfo::ProcInput(ShaderCreateInfo *last_sc) { if(!last_sc) return(false); @@ -85,7 +85,7 @@ bool ShaderCreater::ProcInput(ShaderCreater *last_sc) return(true); } -bool ShaderCreater::ProcOutput() +bool ShaderCreateInfo::ProcOutput() { output_struct.Clear(); @@ -114,7 +114,7 @@ bool ShaderCreater::ProcOutput() return(true); } -bool ShaderCreater::ProcStruct() +bool ShaderCreateInfo::ProcStruct() { const AnsiStringList &struct_list=sdm->GetStructList(); @@ -135,7 +135,7 @@ bool ShaderCreater::ProcStruct() return(true); } -bool ShaderCreater::ProcUBO() +bool ShaderCreateInfo::ProcUBO() { auto ubo_list=sdm->GetUBOList(); @@ -164,12 +164,12 @@ bool ShaderCreater::ProcUBO() return(true); } -bool ShaderCreater::ProcSSBO() +bool ShaderCreateInfo::ProcSSBO() { return(false); } -bool ShaderCreater::ProcConst() +bool ShaderCreateInfo::ProcConst() { auto const_list=sdm->GetConstList(); @@ -198,7 +198,7 @@ bool ShaderCreater::ProcConst() return(true); } -bool ShaderCreater::ProcSampler() +bool ShaderCreateInfo::ProcSampler() { auto sampler_list=sdm->GetSamplerList(); @@ -227,7 +227,7 @@ bool ShaderCreater::ProcSampler() return(true); } -bool ShaderCreater::CreateShader(ShaderCreater *last_sc) +bool ShaderCreateInfo::CreateShader(ShaderCreateInfo *last_sc) { final_shader="#version 460 core\n"; @@ -263,7 +263,7 @@ bool ShaderCreater::CreateShader(ShaderCreater *last_sc) return(true); } -bool ShaderCreater::CompileToSPV() +bool ShaderCreateInfo::CompileToSPV() { glsl_compiler::SPVData *spv_data=glsl_compiler::Compile(shader_stage,final_shader.c_str()); diff --git a/src/ShaderGen/ShaderCreaterFragment.cpp b/src/ShaderGen/ShaderCreateInfoFragment.cpp similarity index 87% rename from src/ShaderGen/ShaderCreaterFragment.cpp rename to src/ShaderGen/ShaderCreateInfoFragment.cpp index a1a2ea82..64550f77 100644 --- a/src/ShaderGen/ShaderCreaterFragment.cpp +++ b/src/ShaderGen/ShaderCreateInfoFragment.cpp @@ -1,11 +1,11 @@ -#include +#include #include SHADERGEN_NAMESPACE_BEGIN using namespace hgl::graph; -void ShaderCreaterFragment::UseDefaultMain() +void ShaderCreateInfoFragment::UseDefaultMain() { main_codes="void main()\n{\n"; @@ -28,7 +28,7 @@ void ShaderCreaterFragment::UseDefaultMain() main_codes+="}"; } -bool ShaderCreaterFragment::ProcOutput() +bool ShaderCreateInfoFragment::ProcOutput() { const auto &output_list=sdm->GetShaderStageIO().output; diff --git a/src/ShaderGen/ShaderCreaterGeometry.cpp b/src/ShaderGen/ShaderCreateInfoGeometry.cpp similarity index 100% rename from src/ShaderGen/ShaderCreaterGeometry.cpp rename to src/ShaderGen/ShaderCreateInfoGeometry.cpp diff --git a/src/ShaderGen/ShaderCreaterVertex.cpp b/src/ShaderGen/ShaderCreateInfoVertex.cpp similarity index 81% rename from src/ShaderGen/ShaderCreaterVertex.cpp rename to src/ShaderGen/ShaderCreateInfoVertex.cpp index cbf4ee3e..f1286142 100644 --- a/src/ShaderGen/ShaderCreaterVertex.cpp +++ b/src/ShaderGen/ShaderCreateInfoVertex.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -8,7 +8,7 @@ SHADERGEN_NAMESPACE_BEGIN using namespace hgl; using namespace hgl::graph; -int ShaderCreaterVertex::AddInput(const VAT &type,const AnsiString &name) +int ShaderCreateInfoVertex::AddInput(const VAT &type,const AnsiString &name) { ShaderStage *ss=new ShaderStage; @@ -20,7 +20,7 @@ int ShaderCreaterVertex::AddInput(const VAT &type,const AnsiString &name) return sdm->AddInput(ss); } -int ShaderCreaterVertex::AddInput(const AnsiString &type,const AnsiString &name) +int ShaderCreateInfoVertex::AddInput(const AnsiString &type,const AnsiString &name) { VAT vat; @@ -30,7 +30,7 @@ int ShaderCreaterVertex::AddInput(const AnsiString &type,const AnsiString &name) return AddInput(vat,name); } -bool ShaderCreaterVertex::ProcInput(ShaderCreater *) +bool ShaderCreateInfoVertex::ProcInput(ShaderCreateInfo *) { const auto &input=sdm->GetShaderStageIO().input;