From 6043d1709494d2ab73640e7e9ee443816abad794 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 27 Sep 2021 12:20:44 +0800
Subject: [PATCH] fixed DrawText sample

---
 example/Vulkan/DrawText.cpp | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp
index 0a8989cc..ca92a091 100644
--- a/example/Vulkan/DrawText.cpp
+++ b/example/Vulkan/DrawText.cpp
@@ -27,8 +27,8 @@ class TestApp:public VulkanApplicationFramework
 private:
 
     Sampler *           sampler             =nullptr;
-    MaterialParameters *  material_instance   =nullptr;
-    GPUBuffer *         ubo_camera_info    =nullptr;
+    MaterialInstance *  material_instance   =nullptr;
+    GPUBuffer *         ubo_camera_info     =nullptr;
     GPUBuffer *         ubo_color           =nullptr;
 
     Pipeline *          pipeline            =nullptr;
@@ -63,11 +63,30 @@ private:
         if(!pipeline)return(false);
 
         sampler=db->CreateSampler();
+        
+        {
+            MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
+        
+            if(!mp_global)
+                return(false);
+
+            if(!mp_global->BindUBO("g_camera",ubo_camera_info))return(false);
+
+            mp_global->Update();
+        }
+
+        {
+            MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::Value);
+        
+            if(!mp)
+                return(false);
+            
+            if(!mp->BindSampler("lum_texture",tile_font->GetTexture(),sampler))return(false);            
+            if(!mp->BindUBO("color_material",ubo_color))return(false);
+
+            mp->Update();
+        }
 
-        material_instance->BindSampler("lum_texture",tile_font->GetTexture(),sampler);
-        material_instance->BindUBO("camera",ubo_camera_info);
-        material_instance->BindUBO("color_material",ubo_color);
-        material_instance->Update();
 
         return(true);
     }
@@ -136,7 +155,7 @@ private:
     {
         UTF16String str;
 
-        LoadStringFromTextFile(str,OS_TEXT("README.md"));
+        LoadStringFromTextFile(str,OS_TEXT("res/text/DaoDeBible.txt"));
 
         text_render_obj=db->CreateTextRenderable(material_instance->GetMaterial());