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

use MaterialInstance in indices_rect sample

Browse Source
This commit is contained in:
hyzboy 2020-01-20 16:22:30 +08:00
parent 6e45d2b6b4
commit 5794a3a23c
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
example/Vulkan/indices_rect.cpp
View File

@ -40,7 +40,7 @@ private:
WorldMatrix wm; WorldMatrix wm;
vulkan::Material * material =nullptr; vulkan::Material * material =nullptr;
vulkan::DescriptorSets * descriptor_sets =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr; vulkan::Renderable * render_obj =nullptr;
vulkan::Buffer * ubo_mvp =nullptr; vulkan::Buffer * ubo_mvp =nullptr;
vulkan::Buffer * ubo_color_material =nullptr; vulkan::Buffer * ubo_color_material =nullptr;
@ -60,7 +60,7 @@ public:
SAFE_CLEAR(ubo_color_material); SAFE_CLEAR(ubo_color_material);
SAFE_CLEAR(ubo_mvp); SAFE_CLEAR(ubo_mvp);
SAFE_CLEAR(render_obj); SAFE_CLEAR(render_obj);
SAFE_CLEAR(descriptor_sets); SAFE_CLEAR(material_instance);
SAFE_CLEAR(material); SAFE_CLEAR(material);
} }
@ -74,7 +74,7 @@ private:
return(false); return(false);
render_obj=material->CreateRenderable(VERTEX_COUNT); render_obj=material->CreateRenderable(VERTEX_COUNT);
descriptor_sets=material->CreateDescriptorSets(); material_instance=material->CreateInstance();
return(true); return(true);
} }
@ -85,15 +85,7 @@ private:
if(!ubo) if(!ubo)
return(nullptr); return(nullptr);
const int index=material->GetUBO(name); if(!material_instance->BindUBO(name,ubo))
if(index<0)
{
SAFE_CLEAR(ubo);
return(nullptr);
}
if(!descriptor_sets->BindUBO(index,ubo))
{ {
SAFE_CLEAR(ubo); SAFE_CLEAR(ubo);
return(nullptr); return(nullptr);
@ -110,8 +102,8 @@ private:
ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&wm); ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&wm);
ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color); ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color);
descriptor_sets->Update(); material_instance->Update();
return(true); return(true);
} }
@ -153,15 +145,15 @@ public:
if(!InitPipeline()) if(!InitPipeline())
return(false); return(false);
BuildCommandBuffer(pipeline,descriptor_sets,render_obj); BuildCommandBuffer(pipeline,material_instance->GetDescriptorSets(),render_obj);
return(true); return(true);
} }
void Resize(int,int)override void Resize(int,int)override
{ {
BuildCommandBuffer(pipeline,descriptor_sets,render_obj); BuildCommandBuffer(pipeline,material_instance->GetDescriptorSets(),render_obj);
} }
};//class TestApp:public VulkanApplicationFramework };//class TestApp:public VulkanApplicationFramework