diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index bc6aba39..b710a720 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -51,9 +51,9 @@ private: Texture2D * texture =nullptr; Sampler * sampler =nullptr; - MaterialParameters * material_instance =nullptr; + MaterialInstance * material_instance =nullptr; RenderableInstance *renderable_instance =nullptr; - GPUBuffer * ubo_camera_info =nullptr; + GPUBuffer * ubo_camera_info =nullptr; Pipeline * pipeline =nullptr; private: @@ -71,7 +71,15 @@ private: sampler=db->CreateSampler(); - material_instance->BindSampler("tex",texture,sampler); + { + MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value); + + if(!mp_texture) + + if(!mp_texture->BindUBO("tex",ubo_camera_info))return(false); + + mp_texture->Update(); + } return(true); } @@ -89,9 +97,18 @@ private: if(!ubo_camera_info) return(false); + + { + MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global); + + if(!mp_global) + return(false); + + if(!mp_global->BindUBO("g_camera",ubo_camera_info))return(false); + + mp_global->Update(); + } - if(!material_instance->BindUBO("camera",ubo_camera_info))return(false); - material_instance->Update(); return(true); } diff --git a/res b/res index 897770ef..27da09e0 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 897770ef1d59af09b4863c34fc3040466b95b437 +Subproject commit 27da09e0b6027a5651a030334d5026adef2aaff7