diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index a1c1573b..39fbe826 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -13,8 +13,8 @@ VK_NAMESPACE_BEGIN Texture2D *LoadTGATexture(const OSString &filename,Device *device); VK_NAMESPACE_END -constexpr uint32_t SCREEN_WIDTH=256; -constexpr uint32_t SCREEN_HEIGHT=256; +constexpr uint32_t SCREEN_WIDTH=512; +constexpr uint32_t SCREEN_HEIGHT=512; struct WorldConfig { @@ -118,7 +118,7 @@ private: image_info.imageLayout =*texture; image_info.sampler =*sampler; - desciptor_sets->UpdateSampler(material->GetCombindImageSampler("texture_lena"),&image_info); + desciptor_sets->UpdateSampler(material->GetSampler("texture_lena"),&image_info); return(true); } diff --git a/inc/hgl/graph/vulkan/VKMaterial.h b/inc/hgl/graph/vulkan/VKMaterial.h index 8e9631d6..ff7fdec4 100644 --- a/inc/hgl/graph/vulkan/VKMaterial.h +++ b/inc/hgl/graph/vulkan/VKMaterial.h @@ -31,10 +31,10 @@ public: 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);} - GET_BO_BINDING(Sampler, SAMPLER) +// GET_BO_BINDING(Sampler, SAMPLER) - GET_BO_BINDING(CombindImageSampler, COMBINED_IMAGE_SAMPLER) - GET_BO_BINDING(SampledImage, SAMPLED_IMAGE) + GET_BO_BINDING(Sampler, COMBINED_IMAGE_SAMPLER) +// GET_BO_BINDING(SampledImage, SAMPLED_IMAGE) GET_BO_BINDING(StorageImage, STORAGE_IMAGE) GET_BO_BINDING(UTBO, UNIFORM_TEXEL_BUFFER)