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

VK仅支持CombindImageSamler，所有去掉原本的GetSampler，将GetCombindImageSampler改名为GetSampler

Browse Source
This commit is contained in:
hyzboy 2019-05-21 00:11:50 +08:00
parent cbdbd75e66
commit 056be453f2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/Vulkan/texture_rect.cpp
View File

@ -13,8 +13,8 @@ VK_NAMESPACE_BEGIN
Texture2D *LoadTGATexture(const OSString &filename,Device *device); Texture2D *LoadTGATexture(const OSString &filename,Device *device);
VK_NAMESPACE_END VK_NAMESPACE_END
constexpr uint32_t SCREEN_WIDTH=256; constexpr uint32_t SCREEN_WIDTH=512;
constexpr uint32_t SCREEN_HEIGHT=256; constexpr uint32_t SCREEN_HEIGHT=512;
struct WorldConfig struct WorldConfig
{ {
@ -118,7 +118,7 @@ private:
image_info.imageLayout =*texture; image_info.imageLayout =*texture;
image_info.sampler =*sampler; image_info.sampler =*sampler;
desciptor_sets->UpdateSampler(material->GetCombindImageSampler("texture_lena"),&image_info); desciptor_sets->UpdateSampler(material->GetSampler("texture_lena"),&image_info);
return(true); return(true);
} }

6
inc/hgl/graph/vulkan/VKMaterial.h
View File

@ -31,10 +31,10 @@ public:
const int GetBinding(VkDescriptorType,const UTF8String &)const; const int GetBinding(VkDescriptorType,const UTF8String &)const;
#define GET_BO_BINDING(name,vk_name) const int Get##name(const UTF8String &obj_name)const{return GetBinding(VK_DESCRIPTOR_TYPE_##vk_name,obj_name);} #define GET_BO_BINDING(name,vk_name) const int Get##name(const UTF8String &obj_name)const{return GetBinding(VK_DESCRIPTOR_TYPE_##vk_name,obj_name);}
GET_BO_BINDING(Sampler, SAMPLER) // GET_BO_BINDING(Sampler, SAMPLER)
GET_BO_BINDING(CombindImageSampler, COMBINED_IMAGE_SAMPLER) GET_BO_BINDING(Sampler, COMBINED_IMAGE_SAMPLER)
GET_BO_BINDING(SampledImage, SAMPLED_IMAGE) // GET_BO_BINDING(SampledImage, SAMPLED_IMAGE)
GET_BO_BINDING(StorageImage, STORAGE_IMAGE) GET_BO_BINDING(StorageImage, STORAGE_IMAGE)
GET_BO_BINDING(UTBO, UNIFORM_TEXEL_BUFFER) GET_BO_BINDING(UTBO, UNIFORM_TEXEL_BUFFER)