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

renamed to InlineDescriptor instead of GlobalDescriptor

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-03-29 17:27:05 +08:00
parent 137248a274
commit f280068d50
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/common/VulkanAppFramework.h
View File

@ -142,7 +142,7 @@ public:
ubo_vp_info=db->CreateUBO(sizeof(ViewportInfo),&vp_info); ubo_vp_info=db->CreateUBO(sizeof(ViewportInfo),&vp_info);
db->global_descriptor.AddUBO(GlobalDescriptor::ViewportInfo.name,ubo_vp_info); db->global_descriptor.AddUBO(InlineDescriptor::ViewportInfo.name,ubo_vp_info);
} }
return(true); return(true);

2
inc/hgl/graph/mtl/StdMaterial.h
View File

@ -12,7 +12,7 @@ enum class CoordinateSystem2D
Ortho //左上角为0,0；右下角为(width-1),(height-1) Ortho //左上角为0,0；右下角为(width-1),(height-1)
}; };
namespace GlobalDescriptor namespace InlineDescriptor
{ {
struct ShaderStruct struct ShaderStruct
{ {

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

@ -53,7 +53,7 @@ public:
~MaterialCreateInfo()=default; ~MaterialCreateInfo()=default;
bool AddStruct(const AnsiString &ubo_typename,const AnsiString &codes); bool AddStruct(const AnsiString &ubo_typename,const AnsiString &codes);
bool AddStruct(const GlobalDescriptor::ShaderStruct &ss) bool AddStruct(const InlineDescriptor::ShaderStruct &ss)
{ {
return AddStruct(ss.struct_name,ss.codes); return AddStruct(ss.struct_name,ss.codes);
} }
@ -61,7 +61,7 @@ public:
bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name); bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const AnsiString &type_name,const AnsiString &name);
bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name); bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name);
bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType &set_type,const GlobalDescriptor::ShaderStruct &ss) bool AddUBO(const VkShaderStageFlagBits flag_bits,const DescriptorSetType &set_type,const InlineDescriptor::ShaderStruct &ss)
{ {
if(!mdi.hasStruct(ss.struct_name)) if(!mdi.hasStruct(ss.struct_name))
mdi.AddStruct(ss.struct_name,ss.codes); mdi.AddStruct(ss.struct_name,ss.codes);

2
src/ShaderGen/2d/VertexColor2D.cpp
View File

@ -24,7 +24,7 @@ MaterialCreateInfo *CreateVertexColor2D(const CoordinateSystem2D &cs)
{ {
mci->AddUBO(VK_SHADER_STAGE_VERTEX_BIT, mci->AddUBO(VK_SHADER_STAGE_VERTEX_BIT,
DescriptorSetType::Global, DescriptorSetType::Global,
GlobalDescriptor::ViewportInfo); InlineDescriptor::ViewportInfo);
sfGetPosition="vec4 GetPosition(){return viewport.ortho_matrix*vec4(Position,0,1);}"; sfGetPosition="vec4 GetPosition(){return viewport.ortho_matrix*vec4(Position,0,1);}";
} }