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

removed shadergen namespace

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-03-21 18:05:48 +08:00
parent bc9fc9b50f
commit d26cae0086
24 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/graph/VKRenderResource.h
View File

@@ -91,11 +91,11 @@ public: //Material
const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size);
Material * CreateMaterial(const OSString &);
Material * CreateMaterial(const hgl::shadergen::MaterialCreateInfo *);
Material * CreateMaterial(const MaterialCreateInfo *);
MaterialInstance * CreateMaterialInstance(Material *,const VILConfig *vil_cfg=nullptr);
MaterialInstance * CreateMaterialInstance(const OSString &,const VILConfig *vil_cfg=nullptr);
MaterialInstance * CreateMaterialInstance(const hgl::shadergen::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
MaterialInstance * CreateMaterialInstance(const MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
Primitive * CreatePrimitive(const uint32_t vertex_count=0);

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

@@ -7,7 +7,7 @@
#include<hgl/shadergen/ShaderCreateInfoMap.h>
#include<hgl/graph/VKSamplerType.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
class MaterialCreateInfo
{
AnsiString shader_name;
@@ -60,4 +60,4 @@ public:
const MaterialDescriptorInfo &GetMDI()const{return mdm;}
};//class MaterialCreateInfo
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

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

@@ -1,13 +1,9 @@
#pragma once
#include<hgl/graph/VKShaderDescriptorSet.h>
#include<hgl/shadergen/ShaderGenNamespace.h>
#include<hgl/type/Map.h>
using namespace hgl;
using namespace hgl::graph;
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
/**
* 材质描述符管理</p>
* 该类使用于SHADER生成前，用于统计编号set/binding
@@ -66,5 +62,5 @@ public:
{
return desc_set_array[size_t(type)].count>0;
}
};
SHADERGEN_NAMESPACE_END
};//class MaterialDescriptorInfo
}}//namespace hgl::graph

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

@@ -1,15 +1,12 @@
#ifndef HGL_SHADER_CREATE_INFO_INCLUDE
#define HGL_SHADER_CREATE_INFO_INCLUDE
#include<hgl/shadergen/ShaderGenNamespace.h>
#include<hgl/graph/VertexAttrib.h>
#include<hgl/graph/VK.h>
namespace glsl_compiler
namespace hgl{namespace graph
{
struct SPVData;
}
SHADERGEN_NAMESPACE_BEGIN
struct SPVData;
class MaterialDescriptorInfo;
class ShaderDescriptorInfo;
@@ -30,7 +27,7 @@ protected:
AnsiString final_shader;
glsl_compiler::SPVData *spv_data;
SPVData *spv_data;
protected:
@@ -72,8 +69,8 @@ public:
bool CreateShader(ShaderCreateInfo *);
const uint32_t *GetSPVData()const;
const uint32 *GetSPVData()const;
const size_t GetSPVSize()const;
};//class ShaderCreateInfo
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph
#endif//HGL_SHADER_CREATE_INFO_INCLUDE

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

@@ -2,7 +2,7 @@
#include<hgl/shadergen/ShaderCreateInfo.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
enum class MaterialType
{
Color, ///<<3C><>ɫ<EFBFBD><C9AB><EFBFBD><EFBFBD>
@@ -19,4 +19,4 @@ public:
void UseDefaultMain();
};
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

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

@@ -2,7 +2,7 @@
#include<hgl/shadergen/ShaderCreateInfo.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
class ShaderCreateInfoGeometry:public ShaderCreateInfo
{
public:
@@ -10,4 +10,4 @@ public:
ShaderCreateInfoGeometry(MaterialDescriptorInfo *m):ShaderCreateInfo(VK_SHADER_STAGE_GEOMETRY_BIT,m){}
~ShaderCreateInfoGeometry()=default;
};
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

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

@@ -2,7 +2,7 @@
#include<hgl/shadergen/ShaderCreateInfo.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
class ShaderCreateInfoMap:public ObjectMap<VkShaderStageFlagBits,ShaderCreateInfo>
{
public:
@@ -22,4 +22,4 @@ public:
return(true);
}
};
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

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

@@ -4,7 +4,7 @@
#include<hgl/graph/VKShaderStage.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
class ShaderCreateInfoVertex:public ShaderCreateInfo
{
bool ProcInput(ShaderCreateInfo *) override;
@@ -17,4 +17,4 @@ public:
int AddInput(const graph::VAT &type,const AnsiString &name);
int AddInput(const AnsiString &type,const AnsiString &name);
};
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

7
inc/hgl/shadergen/ShaderDescriptorInfo.h
View File

@@ -1,14 +1,13 @@
#pragma once
#include<hgl/shadergen/ShaderGenNamespace.h>
#include<hgl/type/Map.h>
#include<hgl/type/StringList.h>
#include<hgl/graph/VKShaderStage.h>
#include<hgl/graph/VKDescriptorSetType.h>
#include<hgl/shadergen/MaterialDescriptorInfo.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph
{
using UBODescriptorList=List<const UBODescriptor *>;
using SamplerDescriptorList=List<const SamplerDescriptor *>;
using ConstValueDescriptorList=ObjectList<ConstValueDescriptor>;
@@ -72,4 +71,4 @@ public:
void DebugOutput(int);
#endif//_DEBUG
};//class ShaderDescriptorInfo
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph

13
inc/hgl/shadergen/ShaderGenNamespace.h
View File

@@ -1,13 +0,0 @@
#ifndef HGL_SHADER_GEN_COMMON_INCLUDE
#define HGL_SHADER_GEN_COMMON_INCLUDE
#include<hgl/type/String.h>
#include<hgl/graph/VK.h>
#define SHADERGEN_NAMESPACE_BEGIN namespace hgl{namespace shadergen{
#define SHADERGEN_NAMESPACE_END }}
#define SHADERGEN_NAMESPACE_USING using namespace hgl::shadergen;
SHADERGEN_NAMESPACE_BEGIN
SHADERGEN_NAMESPACE_END
#endif//HGL_SHADER_GEN_COMMON_INCLUDE

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

@@ -1,7 +1,7 @@
#include<hgl/shadergen/ShaderDescriptorInfo.h>
#include<hgl/CompOperator.h>
SHADERGEN_NAMESPACE_BEGIN
namespace hgl{namespace graph{
using ParamPreciseFlagBits=uint8;
using PPFB=ParamPreciseFlagBits;
@@ -101,4 +101,4 @@ public:
hgl_zero(*this);
}
};//struct Standard2DMaterial:public StandardMaterial
SHADERGEN_NAMESPACE_END
}}//namespace hgl::graph