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

renamed files of shadergen

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-17 10:14:07 +08:00
parent 555e8fc066
commit 9ee5f0adaa
15 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/shadergen/MaterialCreateInfo.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include<hgl/shadergen/MaterialDescriptorManager.h> #include<hgl/shadergen/MaterialDescriptorInfo.h>
#include<hgl/shadergen/ShaderCreateInfoVertex.h> #include<hgl/shadergen/ShaderCreateInfoVertex.h>
#include<hgl/shadergen/ShaderCreateInfoGeometry.h> #include<hgl/shadergen/ShaderCreateInfoGeometry.h>
#include<hgl/shadergen/ShaderCreateInfoFragment.h> #include<hgl/shadergen/ShaderCreateInfoFragment.h>
@ -17,7 +17,7 @@ protected:
uint32_t shader_stage; ///<着色器阶段 uint32_t shader_stage; ///<着色器阶段
MaterialDescriptorManager mdm; ///<材质描述符管理器 MaterialDescriptorInfo mdm; ///<材质描述符管理器
ShaderCreateInfoMap shader_map; ///<着色器列表 ShaderCreateInfoMap shader_map; ///<着色器列表

6
inc/hgl/shadergen/MaterialDescriptorManager.h → inc/hgl/shadergen/MaterialDescriptorInfo.h
View File

@ -13,7 +13,7 @@ SHADERGEN_NAMESPACE_BEGIN
* 材质描述符管理</p> * 材质描述符管理</p>
* 该类使用于SHADER生成前，用于统计编号set/binding * 该类使用于SHADER生成前，用于统计编号set/binding
*/ */
class MaterialDescriptorManager class MaterialDescriptorInfo
{ {
struct ShaderDescriptorSet struct ShaderDescriptorSet
{ {
@ -39,8 +39,8 @@ class MaterialDescriptorManager
public: public:
MaterialDescriptorManager(); MaterialDescriptorInfo();
~MaterialDescriptorManager()=default; ~MaterialDescriptorInfo()=default;
bool AddStruct(const AnsiString &name,const AnsiString &code) bool AddStruct(const AnsiString &name,const AnsiString &code)
{ {

10
inc/hgl/shadergen/ShaderCreateInfo.h
View File

@ -5,8 +5,8 @@
#include<hgl/graph/VertexAttrib.h> #include<hgl/graph/VertexAttrib.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
class MaterialDescriptorManager; class MaterialDescriptorInfo;
class ShaderDescriptorManager; class ShaderDescriptorInfo;
class ShaderCreateInfo class ShaderCreateInfo
{ {
@ -14,7 +14,7 @@ protected:
VkShaderStageFlagBits shader_stage; ///<着色器阶段 VkShaderStageFlagBits shader_stage; ///<着色器阶段
MaterialDescriptorManager *mdm; MaterialDescriptorInfo *mdm;
protected: protected:
@ -42,13 +42,13 @@ protected:
public: public:
ShaderDescriptorManager *sdm; ShaderDescriptorInfo *sdm;
VkShaderStageFlagBits GetShaderStage()const{return shader_stage;} VkShaderStageFlagBits GetShaderStage()const{return shader_stage;}
public: public:
ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m); ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorInfo *m);
virtual ~ShaderCreateInfo(); virtual ~ShaderCreateInfo();
int AddOutput(const graph::VAT &type,const AnsiString &name); int AddOutput(const graph::VAT &type,const AnsiString &name);

2
inc/hgl/shadergen/ShaderCreateInfoFragment.h
View File

@ -14,7 +14,7 @@ class ShaderCreateInfoFragment:public ShaderCreateInfo
public: public:
ShaderCreateInfoFragment(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){} ShaderCreateInfoFragment(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_FRAGMENT_BIT,m){}
~ShaderCreateInfoFragment()=default; ~ShaderCreateInfoFragment()=default;
void UseDefaultMain(); void UseDefaultMain();

2
inc/hgl/shadergen/ShaderCreateInfoGeometry.h
View File

@ -7,7 +7,7 @@ class ShaderCreateInfoGeometry:public ShaderCreateInfo
{ {
public: public:
ShaderCreateInfoGeometry(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){} ShaderCreateInfoGeometry(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){}
~ShaderCreateInfoGeometry()=default; ~ShaderCreateInfoGeometry()=default;
}; };
SHADERGEN_NAMESPACE_END SHADERGEN_NAMESPACE_END

2
inc/hgl/shadergen/ShaderCreateInfoVertex.h
View File

@ -9,7 +9,7 @@ class ShaderCreateInfoVertex:public ShaderCreateInfo
public: public:
ShaderCreateInfoVertex(MaterialDescriptorManager *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){} ShaderCreateInfoVertex(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_VERTEX_BIT,m){}
~ShaderCreateInfoVertex()=default; ~ShaderCreateInfoVertex()=default;
int AddInput(const graph::VAT &type,const AnsiString &name); int AddInput(const graph::VAT &type,const AnsiString &name);

12
inc/hgl/shadergen/ShaderDescriptorManager.h → inc/hgl/shadergen/ShaderDescriptorInfo.h
View File

@ -5,7 +5,7 @@
#include<hgl/type/StringList.h> #include<hgl/type/StringList.h>
#include<hgl/graph/VKShaderStage.h> #include<hgl/graph/VKShaderStage.h>
#include<hgl/graph/VKDescriptorSetType.h> #include<hgl/graph/VKDescriptorSetType.h>
#include<hgl/shadergen/MaterialDescriptorManager.h> #include<hgl/shadergen/MaterialDescriptorInfo.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
@ -17,7 +17,7 @@ using SubpassInputDescriptorList=ObjectList<SubpassInputDescriptor>;
/** /**
* Shader数据管理器,用于生成正式Shader前的资源统计 * Shader数据管理器,用于生成正式Shader前的资源统计
*/ */
class ShaderDescriptorManager class ShaderDescriptorInfo
{ {
VkShaderStageFlagBits shader_stage; VkShaderStageFlagBits shader_stage;
@ -25,7 +25,7 @@ class ShaderDescriptorManager
AnsiStringList struct_list; //用到的结构列表 AnsiStringList struct_list; //用到的结构列表
//ubo/object在这里以及MaterialDescriptorManager中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader //ubo/object在这里以及MaterialDescriptorInfo中均有一份，mdm中的用于产生set/binding号，这里的用于产生shader
UBODescriptorList ubo_list; UBODescriptorList ubo_list;
SamplerDescriptorList sampler_list; SamplerDescriptorList sampler_list;
@ -36,8 +36,8 @@ class ShaderDescriptorManager
public: public:
ShaderDescriptorManager(VkShaderStageFlagBits); ShaderDescriptorInfo(VkShaderStageFlagBits);
~ShaderDescriptorManager()=default; ~ShaderDescriptorInfo()=default;
const VkShaderStageFlagBits GetStageBits()const { return shader_stage; } const VkShaderStageFlagBits GetStageBits()const { return shader_stage; }
const AnsiString GetStageName()const { return AnsiString(GetShaderStageName(shader_stage)); } const AnsiString GetStageName()const { return AnsiString(GetShaderStageName(shader_stage)); }
@ -71,5 +71,5 @@ public:
#ifdef _DEBUG #ifdef _DEBUG
void DebugOutput(int); void DebugOutput(int);
#endif//_DEBUG #endif//_DEBUG
};//class ShaderDescriptorManager };//class ShaderDescriptorInfo
SHADERGEN_NAMESPACE_END SHADERGEN_NAMESPACE_END

3
inc/hgl/shadergen/StandardMaterial.h
View File

@ -1,4 +1,4 @@
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
#include<hgl/CompOperator.h> #include<hgl/CompOperator.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
@ -106,5 +106,6 @@ class MaterialCreateInfo;
Material *CreateMaterial() Material *CreateMaterial()
{ {
return nullptr;
} }
SHADERGEN_NAMESPACE_END SHADERGEN_NAMESPACE_END

8
src/ShaderGen/CMakeLists.txt
View File

@ -22,14 +22,14 @@ SOURCE_GROUP("Material Create Info" FILES ${MATERIAL_CREATE_INFO_HEADER_FILES}
${MATERIAL_CREATE_INFO_SOURCE_FILES}) ${MATERIAL_CREATE_INFO_SOURCE_FILES})
SET(SHADERGEN_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/ShaderGenNamespace.h SET(SHADERGEN_HEADER_FILES ${SHADERGEN_INCLUDE_PATH}/ShaderGenNamespace.h
${SHADERGEN_INCLUDE_PATH}/ShaderDescriptorManager.h ${SHADERGEN_INCLUDE_PATH}/ShaderDescriptorInfo.h
${SHADERGEN_INCLUDE_PATH}/MaterialDescriptorManager.h) ${SHADERGEN_INCLUDE_PATH}/MaterialDescriptorInfo.h)
SET(SHADERGEN_SOURCE_FILES SET(SHADERGEN_SOURCE_FILES
#PMC.cpp #PMC.cpp
# VertexPolicy.cpp # VertexPolicy.cpp
ShaderDescriptorManager.cpp ShaderDescriptorInfo.cpp
MaterialDescriptorManager.cpp MaterialDescriptorInfo.cpp
) )
SET(GLSL_COMPILER_SOURCE GLSLCompiler.h SET(GLSL_COMPILER_SOURCE GLSLCompiler.h

2
src/ShaderGen/MaterialCreateInfo.cpp
View File

@ -1,5 +1,5 @@
#include<hgl/shadergen/MaterialCreateInfo.h> #include<hgl/shadergen/MaterialCreateInfo.h>
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
using namespace hgl; using namespace hgl;
using namespace hgl::graph; using namespace hgl::graph;

18
src/ShaderGen/MaterialDescriptorManager.cpp → src/ShaderGen/MaterialDescriptorInfo.cpp
View File

@ -1,7 +1,7 @@
#include<hgl/shadergen/MaterialDescriptorManager.h> #include<hgl/shadergen/MaterialDescriptorInfo.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
MaterialDescriptorManager::MaterialDescriptorManager() MaterialDescriptorInfo::MaterialDescriptorInfo()
{ {
int set_type=(int)DescriptorSetType::BEGIN_RANGE; 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) for(auto &sds:desc_set_array)
if(sds.descriptor_map.KeyExist(name)) if(sds.descriptor_map.KeyExist(name))
@ -28,7 +28,7 @@ const DescriptorSetType MaterialDescriptorManager::GetSetType(const AnsiString &
/** /**
* 添加一个描述符，如果它本身存在，则返回false * 添加一个描述符，如果它本身存在，则返回false
*/ */
ShaderDescriptor *MaterialDescriptorManager::ShaderDescriptorSet::AddDescriptor(VkShaderStageFlagBits ssb,ShaderDescriptor *new_sd) ShaderDescriptor *MaterialDescriptorInfo::ShaderDescriptorSet::AddDescriptor(VkShaderStageFlagBits ssb,ShaderDescriptor *new_sd)
{ {
ShaderDescriptor *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); RANGE_CHECK_RETURN_NULLPTR(set_type);
if(!sd)return(nullptr); if(!sd)return(nullptr);
@ -64,7 +64,7 @@ const UBODescriptor *MaterialDescriptorManager::AddUBO(VkShaderStageFlagBits ssb
return((UBODescriptor *)obj); 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); RANGE_CHECK_RETURN_NULLPTR(set_type);
if(!sd)return(nullptr); if(!sd)return(nullptr);
@ -77,7 +77,7 @@ const SamplerDescriptor *MaterialDescriptorManager::AddSampler(VkShaderStageFlag
return((SamplerDescriptor *)obj); return((SamplerDescriptor *)obj);
} }
UBODescriptor *MaterialDescriptorManager::GetUBO(const AnsiString &name) UBODescriptor *MaterialDescriptorInfo::GetUBO(const AnsiString &name)
{ {
UBODescriptor *sd; UBODescriptor *sd;
@ -87,7 +87,7 @@ UBODescriptor *MaterialDescriptorManager::GetUBO(const AnsiString &name)
return(nullptr); return(nullptr);
} }
SamplerDescriptor *MaterialDescriptorManager::GetSampler(const AnsiString &name) SamplerDescriptor *MaterialDescriptorInfo::GetSampler(const AnsiString &name)
{ {
SamplerDescriptor *sd; SamplerDescriptor *sd;
@ -97,7 +97,7 @@ SamplerDescriptor *MaterialDescriptorManager::GetSampler(const AnsiString &name)
return(nullptr); return(nullptr);
} }
void MaterialDescriptorManager::Resort() void MaterialDescriptorInfo::Resort()
{ {
//重新生成set/binding //重新生成set/binding
{ {

6
src/ShaderGen/ShaderCreateInfo.cpp
View File

@ -1,13 +1,13 @@
#include<hgl/shadergen/ShaderCreateInfo.h> #include<hgl/shadergen/ShaderCreateInfo.h>
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
#include"GLSLCompiler.h" #include"GLSLCompiler.h"
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
ShaderCreateInfo::ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorManager *m) ShaderCreateInfo::ShaderCreateInfo(VkShaderStageFlagBits ss,MaterialDescriptorInfo *m)
{ {
shader_stage=ss; shader_stage=ss;
mdm=m; mdm=m;
sdm=new ShaderDescriptorManager(ss); sdm=new ShaderDescriptorInfo(ss);
} }
ShaderCreateInfo::~ShaderCreateInfo() ShaderCreateInfo::~ShaderCreateInfo()

2
src/ShaderGen/ShaderCreateInfoFragment.cpp
View File

@ -1,5 +1,5 @@
#include<hgl/shadergen/ShaderCreateInfoFragment.h> #include<hgl/shadergen/ShaderCreateInfoFragment.h>
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN

2
src/ShaderGen/ShaderCreateInfoVertex.cpp
View File

@ -1,5 +1,5 @@
#include<hgl/shadergen/ShaderCreateInfoVertex.h> #include<hgl/shadergen/ShaderCreateInfoVertex.h>
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
#include<hgl/graph/VertexAttrib.h> #include<hgl/graph/VertexAttrib.h>
#include<hgl/graph/VKShaderStage.h> #include<hgl/graph/VKShaderStage.h>

20
src/ShaderGen/ShaderDescriptorManager.cpp → src/ShaderGen/ShaderDescriptorInfo.cpp
View File

@ -1,7 +1,7 @@
#include<hgl/shadergen/ShaderDescriptorManager.h> #include<hgl/shadergen/ShaderDescriptorInfo.h>
SHADERGEN_NAMESPACE_BEGIN SHADERGEN_NAMESPACE_BEGIN
ShaderDescriptorManager::ShaderDescriptorManager(VkShaderStageFlagBits flag_bit) ShaderDescriptorInfo::ShaderDescriptorInfo(VkShaderStageFlagBits flag_bit)
{ {
shader_stage=flag_bit; shader_stage=flag_bit;
@ -20,7 +20,7 @@ namespace
} }
}//namespace }//namespace
bool ShaderDescriptorManager::AddInput(ShaderStage *ss) bool ShaderDescriptorInfo::AddInput(ShaderStage *ss)
{ {
if(!ss)return(false); if(!ss)return(false);
@ -31,7 +31,7 @@ bool ShaderDescriptorManager::AddInput(ShaderStage *ss)
return(true); return(true);
} }
bool ShaderDescriptorManager::AddOutput(ShaderStage *ss) bool ShaderDescriptorInfo::AddOutput(ShaderStage *ss)
{ {
if(!ss)return(false); if(!ss)return(false);
@ -42,7 +42,7 @@ bool ShaderDescriptorManager::AddOutput(ShaderStage *ss)
return(true); return(true);
} }
bool ShaderDescriptorManager::AddUBO(DescriptorSetType type,const UBODescriptor *ubo) bool ShaderDescriptorInfo::AddUBO(DescriptorSetType type,const UBODescriptor *ubo)
{ {
if(!ubo) if(!ubo)
return(false); return(false);
@ -53,7 +53,7 @@ bool ShaderDescriptorManager::AddUBO(DescriptorSetType type,const UBODescriptor
return true; return true;
} }
bool ShaderDescriptorManager::AddSampler(DescriptorSetType type,const SamplerDescriptor *sampler) bool ShaderDescriptorInfo::AddSampler(DescriptorSetType type,const SamplerDescriptor *sampler)
{ {
if(!sampler) if(!sampler)
return(false); return(false);
@ -62,7 +62,7 @@ bool ShaderDescriptorManager::AddSampler(DescriptorSetType type,const SamplerDes
return true; return true;
} }
bool ShaderDescriptorManager::AddConstValue(ConstValueDescriptor *sd) bool ShaderDescriptorInfo::AddConstValue(ConstValueDescriptor *sd)
{ {
if(!sd)return(false); if(!sd)return(false);
@ -74,7 +74,7 @@ bool ShaderDescriptorManager::AddConstValue(ConstValueDescriptor *sd)
return(true); 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) for(auto *si:subpass_input)
{ {
@ -91,7 +91,7 @@ bool ShaderDescriptorManager::AddSubpassInput(const UTF8String name,uint8_t inde
return(true); 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.name =name;
push_constant.offset=offset; push_constant.offset=offset;
@ -99,7 +99,7 @@ void ShaderDescriptorManager::SetPushConstant(const UTF8String name,uint8_t offs
} }
#ifdef _DEBUG #ifdef _DEBUG
void ShaderDescriptorManager::DebugOutput(int index) void ShaderDescriptorInfo::DebugOutput(int index)
{ {
UTF8String name=GetStageName(); UTF8String name=GetStageName();