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

improved WriteDescriptorSet codes.

Browse Source
This commit is contained in:
hyzboy 2020-10-29 21:19:50 +08:00
parent b02638e840
commit b875b6a489
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/RenderDevice/VKDescriptorSets.cpp
View File

@ -34,6 +34,30 @@ namespace
pTexelBufferView= nullptr; pTexelBufferView= nullptr;
} }
};//struct WriteDescriptorSet };//struct WriteDescriptorSet
struct DescriptorBufferInfo:public VkDescriptorBufferInfo
{
public:
DescriptorBufferInfo(const GPUBuffer *buf,const VkDeviceSize off,const VkDeviceSize rng)
{
buffer=buf->GetBuffer();
offset=off;
range=rng;
}
};//struct DescriptorBufferInfo:public VkDescriptorBufferInfo
struct DescriptorImageInfo:public VkDescriptorImageInfo
{
public:
DescriptorImageInfo(Texture *tex,Sampler *sam)
{
sampler=*sam;
imageView=tex->GetVulkanImageView();
imageLayout=VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
};//struct DescriptorImageInfo:public VkDescriptorImageInfo
}//namespace }//namespace
void DescriptorSets::Clear() void DescriptorSets::Clear()
@ -48,9 +72,7 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf)
if(binding<0||!buf) if(binding<0||!buf)
return(false); return(false);
WriteDescriptorSet wds(desc_set,binding,buf->GetBufferInfo()); wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo()));
wds_list.Add(wds);
return(true); return(true);
} }
@ -59,17 +81,11 @@ bool DescriptorSets::BindUBO(const int binding,const GPUBuffer *buf,const VkDevi
if(binding<0||!buf) if(binding<0||!buf)
return(false); return(false);
VkDescriptorBufferInfo *buf_info=new VkDescriptorBufferInfo; DescriptorBufferInfo *buf_info=new DescriptorBufferInfo(buf,offset,range);
buf_info->buffer=buf->GetBuffer();
buf_info->offset=offset;
buf_info->range=range;
buffer_list.Add(buf_info); buffer_list.Add(buf_info);
WriteDescriptorSet wds(desc_set,binding,buf_info); wds_list.Add(WriteDescriptorSet(desc_set,binding,buf_info));
wds_list.Add(wds);
return(true); return(true);
} }
@ -78,9 +94,7 @@ bool DescriptorSets::BindUBODynamic(const int binding,const GPUBuffer *buf)
if(binding<0||!buf) if(binding<0||!buf)
return(false); return(false);
WriteDescriptorSet wds(desc_set,binding,buf->GetBufferInfo(),VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC); wds_list.Add(WriteDescriptorSet(desc_set,binding,buf->GetBufferInfo(),VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC));
wds_list.Add(wds);
return(true); return(true);
} }
@ -89,18 +103,11 @@ bool DescriptorSets::BindSampler(const int binding,Texture *tex,Sampler *sampler
if(binding<0||!tex||!sampler) if(binding<0||!tex||!sampler)
return(false); return(false);
VkDescriptorImageInfo *image_info=new VkDescriptorImageInfo; DescriptorImageInfo *image_info=new DescriptorImageInfo(tex,sampler);
image_info->imageView =tex->GetVulkanImageView();
// image_info.imageLayout =tex->GetImageLayout();
image_info->imageLayout =VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
image_info->sampler =*sampler;
image_list.Add(image_info); image_list.Add(image_info);
WriteDescriptorSet wds(desc_set,binding,image_info); wds_list.Add(WriteDescriptorSet(desc_set,binding,image_info));
wds_list.Add(wds);
return(true); return(true);
} }