renamed to InlineDescriptor instead of GlobalDescriptor

This commit is contained in:
2023-03-29 17:27:05 +08:00
parent 137248a274
commit f280068d50
4 changed files with 5 additions and 5 deletions

View File

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

View File

@@ -53,7 +53,7 @@ public:
~MaterialCreateInfo()=default;
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);
}
@@ -61,7 +61,7 @@ public:
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 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))
mdi.AddStruct(ss.struct_name,ss.codes);