From 9ee5f0adaa43cd0947190bd68e0c7d2f1d6daf6d Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 17 Mar 2023 10:14:07 +0800 Subject: [PATCH] renamed files of shadergen --- inc/hgl/shadergen/MaterialCreateInfo.h | 4 ++-- ...ptorManager.h => MaterialDescriptorInfo.h} | 6 +++--- inc/hgl/shadergen/ShaderCreateInfo.h | 10 +++++----- inc/hgl/shadergen/ShaderCreateInfoFragment.h | 2 +- inc/hgl/shadergen/ShaderCreateInfoGeometry.h | 2 +- inc/hgl/shadergen/ShaderCreateInfoVertex.h | 2 +- ...riptorManager.h => ShaderDescriptorInfo.h} | 12 +++++------ inc/hgl/shadergen/StandardMaterial.h | 3 ++- src/ShaderGen/CMakeLists.txt | 8 ++++---- src/ShaderGen/MaterialCreateInfo.cpp | 2 +- ...Manager.cpp => MaterialDescriptorInfo.cpp} | 18 ++++++++--------- src/ShaderGen/ShaderCreateInfo.cpp | 6 +++--- src/ShaderGen/ShaderCreateInfoFragment.cpp | 2 +- src/ShaderGen/ShaderCreateInfoVertex.cpp | 2 +- ...orManager.cpp => ShaderDescriptorInfo.cpp} | 20 +++++++++---------- 15 files changed, 50 insertions(+), 49 deletions(-) rename inc/hgl/shadergen/{MaterialDescriptorManager.h => MaterialDescriptorInfo.h} (94%) rename inc/hgl/shadergen/{ShaderDescriptorManager.h => ShaderDescriptorInfo.h} (86%) rename src/ShaderGen/{MaterialDescriptorManager.cpp => MaterialDescriptorInfo.cpp} (72%) rename src/ShaderGen/{ShaderDescriptorManager.cpp => ShaderDescriptorInfo.cpp} (80%) diff --git a/inc/hgl/shadergen/MaterialCreateInfo.h b/inc/hgl/shadergen/MaterialCreateInfo.h index 27c93a71..4ab33178 100644 --- a/inc/hgl/shadergen/MaterialCreateInfo.h +++ b/inc/hgl/shadergen/MaterialCreateInfo.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include @@ -17,7 +17,7 @@ protected: uint32_t shader_stage; ///<着色器阶段 - MaterialDescriptorManager mdm; ///<材质描述符管理器 + MaterialDescriptorInfo mdm; ///<材质描述符管理器 ShaderCreateInfoMap shader_map; ///<着色器列表 diff --git a/inc/hgl/shadergen/MaterialDescriptorManager.h b/inc/hgl/shadergen/MaterialDescriptorInfo.h similarity index 94% rename from inc/hgl/shadergen/MaterialDescriptorManager.h rename to inc/hgl/shadergen/MaterialDescriptorInfo.h index 7b976dd7..7b36c6d3 100644 --- a/inc/hgl/shadergen/MaterialDescriptorManager.h +++ b/inc/hgl/shadergen/MaterialDescriptorInfo.h @@ -13,7 +13,7 @@ SHADERGEN_NAMESPACE_BEGIN * 材质描述符管理

* 该类使用于SHADER生成前，用于统计编号set/binding */ -class MaterialDescriptorManager +class MaterialDescriptorInfo { struct ShaderDescriptorSet { @@ -39,8 +39,8 @@ class MaterialDescriptorManager public: - MaterialDescriptorManager(); - ~MaterialDescriptorManager()=default; + MaterialDescriptorInfo(); + ~MaterialDescriptorInfo()=default; bool AddStruct(const AnsiString &name,const AnsiString &code) { diff --git a/inc/hgl/shadergen/ShaderCreateInfo.h b/inc/hgl/shadergen/ShaderCreateInfo.h index a76f688c..701e4508 100644 --- a/inc/hgl/shadergen/ShaderCreateInfo.h +++ b/inc/hgl/shadergen/ShaderCreateInfo.h @@ -5,8 +5,8 @@ #include SHADERGEN_NAMESPACE_BEGIN -class MaterialDescriptorManager; -class ShaderDescriptorManager; +class MaterialDescriptorInfo; +class ShaderDescriptorInfo; class ShaderCreateInfo { @@ -14,7 +14,7 @@ protected: VkShaderStageFlagBits shader_stage; ///<着色器阶段 - MaterialDescriptorManager *mdm; + MaterialDescriptorInfo *mdm; protected: @@ -42,13 +42,13 @@ protected: public: - ShaderDescriptorManager *sdm; + ShaderDescriptorInfo *sdm; VkShaderStageFlagBits GetShaderStage()const{return shader_stage;} public: - ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m); + ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorInfo *m); virtual ~ShaderCreateInfo(); int AddOutput(const graph::VAT &type,const AnsiString &name); diff --git a/inc/hgl/shadergen/ShaderCreateInfoFragment.h b/inc/hgl/shadergen/ShaderCreateInfoFragment.h index 4b45b082..8848f30e 100644 --- a/inc/hgl/shadergen/ShaderCreateInfoFragment.h +++ b/inc/hgl/shadergen/ShaderCreateInfoFragment.h @@ -14,7 +14,7 @@ class ShaderCreateInfoFragment:public ShaderCreateInfo public: - ShaderCreateInfoFragment(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){} + ShaderCreateInfoFragment(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){} ~ShaderCreateInfoFragment()=default; void UseDefaultMain(); diff --git a/inc/hgl/shadergen/ShaderCreateInfoGeometry.h b/inc/hgl/shadergen/ShaderCreateInfoGeometry.h index 2d304600..ee89faae 100644 --- a/inc/hgl/shadergen/ShaderCreateInfoGeometry.h +++ b/inc/hgl/shadergen/ShaderCreateInfoGeometry.h @@ -7,7 +7,7 @@ class ShaderCreateInfoGeometry:public ShaderCreateInfo { public: - ShaderCreateInfoGeometry(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){} + ShaderCreateInfoGeometry(MaterialDescriptorInfo *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/ShaderCreateInfoVertex.h b/inc/hgl/shadergen/ShaderCreateInfoVertex.h index 5b2fa39e..8fd1d47a 100644 --- a/inc/hgl/shadergen/ShaderCreateInfoVertex.h +++ b/inc/hgl/shadergen/ShaderCreateInfoVertex.h @@ -9,7 +9,7 @@ class ShaderCreateInfoVertex:public ShaderCreateInfo public: - ShaderCreateInfoVertex(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){} + ShaderCreateInfoVertex(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){} ~ShaderCreateInfoVertex()=default; int AddInput(const graph::VAT &type,const AnsiString &name); diff --git a/inc/hgl/shadergen/ShaderDescriptorManager.h b/inc/hgl/shadergen/ShaderDescriptorInfo.h similarity index 86% rename from inc/hgl/shadergen/ShaderDescriptorManager.h rename to inc/hgl/shadergen/ShaderDescriptorInfo.h index aea24ad8..4ab97451 100644 --- a/inc/hgl/shadergen/ShaderDescriptorManager.h +++ b/inc/hgl/shadergen/ShaderDescriptorInfo.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include SHADERGEN_NAMESPACE_BEGIN @@ -17,7 +17,7 @@ using SubpassInputDescriptorList=ObjectList; /** * Shader数据管理器,用于生成正式Shader前的资源统计 */ -class ShaderDescriptorManager +class ShaderDescriptorInfo { VkShaderStageFlagBits shader_stage; @@ -25,7 +25,7 @@ class ShaderDescriptorManager AnsiStringList struct_list; //用到的结构列表 - //ubo/object在这里以及MaterialDescriptorManager中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader + //ubo/object在这里以及MaterialDescriptorInfo中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader UBODescriptorList ubo_list; SamplerDescriptorList sampler_list; @@ -36,8 +36,8 @@ class ShaderDescriptorManager public: - ShaderDescriptorManager(VkShaderStageFlagBits); - ~ShaderDescriptorManager()=default; + ShaderDescriptorInfo(VkShaderStageFlagBits); + ~ShaderDescriptorInfo()=default; const VkShaderStageFlagBits GetStageBits()const { return shader_stage; } const AnsiString GetStageName()const { return AnsiString(GetShaderStageName(shader_stage)); } @@ -71,5 +71,5 @@ public: #ifdef _DEBUG void DebugOutput(int); #endif//_DEBUG -};//class ShaderDescriptorManager +};//class ShaderDescriptorInfo SHADERGEN_NAMESPACE_END diff --git a/inc/hgl/shadergen/StandardMaterial.h b/inc/hgl/shadergen/StandardMaterial.h index 9cb540c7..cca3821d 100644 --- a/inc/hgl/shadergen/StandardMaterial.h +++ b/inc/hgl/shadergen/StandardMaterial.h @@ -1,4 +1,4 @@ -#include +#include #include SHADERGEN_NAMESPACE_BEGIN @@ -106,5 +106,6 @@ class MaterialCreateInfo; Material *CreateMaterial() { + return nullptr; } SHADERGEN_NAMESPACE_END diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt index 7b4bbdcc..a0f568b9 100644 --- a/src/ShaderGen/CMakeLists.txt +++ b/src/ShaderGen/CMakeLists.txt @@ -22,14 +22,14 @@ 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 - ${SHADERGEN_INCLUDE_PATH}/MaterialDescriptorManager.h) + ${SHADERGEN_INCLUDE_PATH}/ShaderDescriptorInfo.h + ${SHADERGEN_INCLUDE_PATH}/MaterialDescriptorInfo.h) SET(SHADERGEN_SOURCE_FILES #PMC.cpp # VertexPolicy.cpp - ShaderDescriptorManager.cpp - MaterialDescriptorManager.cpp + ShaderDescriptorInfo.cpp + MaterialDescriptorInfo.cpp ) SET(GLSL_COMPILER_SOURCE GLSLCompiler.h diff --git a/src/ShaderGen/MaterialCreateInfo.cpp b/src/ShaderGen/MaterialCreateInfo.cpp index 2c35d464..3ffeeee4 100644 --- a/src/ShaderGen/MaterialCreateInfo.cpp +++ b/src/ShaderGen/MaterialCreateInfo.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace hgl; using namespace hgl::graph; diff --git a/src/ShaderGen/MaterialDescriptorManager.cpp b/src/ShaderGen/MaterialDescriptorInfo.cpp similarity index 72% rename from src/ShaderGen/MaterialDescriptorManager.cpp rename to src/ShaderGen/MaterialDescriptorInfo.cpp index 0aba71ea..e1773ab1 100644 --- a/src/ShaderGen/MaterialDescriptorManager.cpp +++ b/src/ShaderGen/MaterialDescriptorInfo.cpp @@ -1,7 +1,7 @@ -#include +#include SHADERGEN_NAMESPACE_BEGIN -MaterialDescriptorManager::MaterialDescriptorManager() +MaterialDescriptorInfo::MaterialDescriptorInfo() { int set_type=(int)DescriptorSetType::BEGIN_RANGE; @@ -16,7 +16,7 @@ MaterialDescriptorManager::MaterialDescriptorManager() } } -const DescriptorSetType MaterialDescriptorManager::GetSetType(const AnsiString &name)const +const DescriptorSetType MaterialDescriptorInfo::GetSetType(const AnsiString &name)const { for(auto &sds:desc_set_array) if(sds.descriptor_map.KeyExist(name)) @@ -28,7 +28,7 @@ const DescriptorSetType MaterialDescriptorManager::GetSetType(const AnsiString & /** * 添加一个描述符，如果它本身存在，则返回false */ -ShaderDescriptor *MaterialDescriptorManager::ShaderDescriptorSet::AddDescriptor(VkShaderStageFlagBits ssb,ShaderDescriptor *new_sd) +ShaderDescriptor *MaterialDescriptorInfo::ShaderDescriptorSet::AddDescriptor(VkShaderStageFlagBits ssb,ShaderDescriptor *new_sd) { ShaderDescriptor *sd; @@ -51,7 +51,7 @@ ShaderDescriptor *MaterialDescriptorManager::ShaderDescriptorSet::AddDescriptor( } } -const UBODescriptor *MaterialDescriptorManager::AddUBO(VkShaderStageFlagBits ssb,DescriptorSetType set_type,UBODescriptor *sd) +const UBODescriptor *MaterialDescriptorInfo::AddUBO(VkShaderStageFlagBits ssb,DescriptorSetType set_type,UBODescriptor *sd) { RANGE_CHECK_RETURN_NULLPTR(set_type); if(!sd)return(nullptr); @@ -64,7 +64,7 @@ const UBODescriptor *MaterialDescriptorManager::AddUBO(VkShaderStageFlagBits ssb return((UBODescriptor *)obj); } -const SamplerDescriptor *MaterialDescriptorManager::AddSampler(VkShaderStageFlagBits ssb,DescriptorSetType set_type,SamplerDescriptor *sd) +const SamplerDescriptor *MaterialDescriptorInfo::AddSampler(VkShaderStageFlagBits ssb,DescriptorSetType set_type,SamplerDescriptor *sd) { RANGE_CHECK_RETURN_NULLPTR(set_type); if(!sd)return(nullptr); @@ -77,7 +77,7 @@ const SamplerDescriptor *MaterialDescriptorManager::AddSampler(VkShaderStageFlag return((SamplerDescriptor *)obj); } -UBODescriptor *MaterialDescriptorManager::GetUBO(const AnsiString &name) +UBODescriptor *MaterialDescriptorInfo::GetUBO(const AnsiString &name) { UBODescriptor *sd; @@ -87,7 +87,7 @@ UBODescriptor *MaterialDescriptorManager::GetUBO(const AnsiString &name) return(nullptr); } -SamplerDescriptor *MaterialDescriptorManager::GetSampler(const AnsiString &name) +SamplerDescriptor *MaterialDescriptorInfo::GetSampler(const AnsiString &name) { SamplerDescriptor *sd; @@ -97,7 +97,7 @@ SamplerDescriptor *MaterialDescriptorManager::GetSampler(const AnsiString &name) return(nullptr); } -void MaterialDescriptorManager::Resort() +void MaterialDescriptorInfo::Resort() { //重新生成set/binding { diff --git a/src/ShaderGen/ShaderCreateInfo.cpp b/src/ShaderGen/ShaderCreateInfo.cpp index 7637cb33..3105f5c4 100644 --- a/src/ShaderGen/ShaderCreateInfo.cpp +++ b/src/ShaderGen/ShaderCreateInfo.cpp @@ -1,13 +1,13 @@ #include -#include +#include #include"GLSLCompiler.h" SHADERGEN_NAMESPACE_BEGIN -ShaderCreateInfo::ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m) +ShaderCreateInfo::ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorInfo *m) { shader_stage=ss; mdm=m; - sdm=new ShaderDescriptorManager(ss); + sdm=new ShaderDescriptorInfo(ss); } ShaderCreateInfo::~ShaderCreateInfo() diff --git a/src/ShaderGen/ShaderCreateInfoFragment.cpp b/src/ShaderGen/ShaderCreateInfoFragment.cpp index 64550f77..fa01f13f 100644 --- a/src/ShaderGen/ShaderCreateInfoFragment.cpp +++ b/src/ShaderGen/ShaderCreateInfoFragment.cpp @@ -1,5 +1,5 @@ #include -#include +#include SHADERGEN_NAMESPACE_BEGIN diff --git a/src/ShaderGen/ShaderCreateInfoVertex.cpp b/src/ShaderGen/ShaderCreateInfoVertex.cpp index f1286142..fac59d2e 100644 --- a/src/ShaderGen/ShaderCreateInfoVertex.cpp +++ b/src/ShaderGen/ShaderCreateInfoVertex.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/src/ShaderGen/ShaderDescriptorManager.cpp b/src/ShaderGen/ShaderDescriptorInfo.cpp similarity index 80% rename from src/ShaderGen/ShaderDescriptorManager.cpp rename to src/ShaderGen/ShaderDescriptorInfo.cpp index 0647a94f..d1c471fd 100644 --- a/src/ShaderGen/ShaderDescriptorManager.cpp +++ b/src/ShaderGen/ShaderDescriptorInfo.cpp @@ -1,7 +1,7 @@ -#include +#include SHADERGEN_NAMESPACE_BEGIN -ShaderDescriptorManager::ShaderDescriptorManager(VkShaderStageFlagBits flag_bit) +ShaderDescriptorInfo::ShaderDescriptorInfo(VkShaderStageFlagBits flag_bit) { shader_stage=flag_bit; @@ -20,7 +20,7 @@ namespace } }//namespace -bool ShaderDescriptorManager::AddInput(ShaderStage *ss) +bool ShaderDescriptorInfo::AddInput(ShaderStage *ss) { if(!ss)return(false); @@ -31,7 +31,7 @@ bool ShaderDescriptorManager::AddInput(ShaderStage *ss) return(true); } -bool ShaderDescriptorManager::AddOutput(ShaderStage *ss) +bool ShaderDescriptorInfo::AddOutput(ShaderStage *ss) { if(!ss)return(false); @@ -42,7 +42,7 @@ bool ShaderDescriptorManager::AddOutput(ShaderStage *ss) return(true); } -bool ShaderDescriptorManager::AddUBO(DescriptorSetType type,const UBODescriptor *ubo) +bool ShaderDescriptorInfo::AddUBO(DescriptorSetType type,const UBODescriptor *ubo) { if(!ubo) return(false); @@ -53,7 +53,7 @@ bool ShaderDescriptorManager::AddUBO(DescriptorSetType type,const UBODescriptor return true; } -bool ShaderDescriptorManager::AddSampler(DescriptorSetType type,const SamplerDescriptor *sampler) +bool ShaderDescriptorInfo::AddSampler(DescriptorSetType type,const SamplerDescriptor *sampler) { if(!sampler) return(false); @@ -62,7 +62,7 @@ bool ShaderDescriptorManager::AddSampler(DescriptorSetType type,const SamplerDes return true; } -bool ShaderDescriptorManager::AddConstValue(ConstValueDescriptor *sd) +bool ShaderDescriptorInfo::AddConstValue(ConstValueDescriptor *sd) { if(!sd)return(false); @@ -74,7 +74,7 @@ bool ShaderDescriptorManager::AddConstValue(ConstValueDescriptor *sd) return(true); } -bool ShaderDescriptorManager::AddSubpassInput(const UTF8String name,uint8_t index) +bool ShaderDescriptorInfo::AddSubpassInput(const UTF8String name,uint8_t index) { for(auto *si:subpass_input) { @@ -91,7 +91,7 @@ bool ShaderDescriptorManager::AddSubpassInput(const UTF8String name,uint8_t inde return(true); } -void ShaderDescriptorManager::SetPushConstant(const UTF8String name,uint8_t offset,uint8_t size) +void ShaderDescriptorInfo::SetPushConstant(const UTF8String name,uint8_t offset,uint8_t size) { push_constant.name =name; push_constant.offset=offset; @@ -99,7 +99,7 @@ void ShaderDescriptorManager::SetPushConstant(const UTF8String name,uint8_t offs } #ifdef _DEBUG -void ShaderDescriptorManager::DebugOutput(int index) +void ShaderDescriptorInfo::DebugOutput(int index) { UTF8String name=GetStageName();