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

合并vs/fs中两个ubo共用一个vulkan buffer *

Browse Source
This commit is contained in:
hyzboy 2020-01-20 15:13:08 +08:00
parent e2811f2b2b
commit 854728ad57
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
example/Vulkan/FragCoordTest.cpp
View File

@ -33,7 +33,6 @@ private:
vulkan::DescriptorSets * descriptor_sets =nullptr; vulkan::DescriptorSets * descriptor_sets =nullptr;
vulkan::Renderable * render_obj =nullptr; vulkan::Renderable * render_obj =nullptr;
vulkan::Buffer * ubo_mvp =nullptr; vulkan::Buffer * ubo_mvp =nullptr;
vulkan::Buffer * ubo_mvp_fs =nullptr;
vulkan::Pipeline * pipeline =nullptr; vulkan::Pipeline * pipeline =nullptr;
@ -45,7 +44,6 @@ public:
{ {
SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(vertex_buffer);
SAFE_CLEAR(pipeline); SAFE_CLEAR(pipeline);
SAFE_CLEAR(ubo_mvp_fs);
SAFE_CLEAR(ubo_mvp); SAFE_CLEAR(ubo_mvp);
SAFE_CLEAR(render_obj); SAFE_CLEAR(render_obj);
SAFE_CLEAR(descriptor_sets); SAFE_CLEAR(descriptor_sets);
@ -66,28 +64,17 @@ private:
return(true); return(true);
} }
vulkan::Buffer *CreateUBO(const UTF8String &name,const VkDeviceSize size,void *data) bool BindUBO(const UTF8String &name,vulkan::Buffer *ubo)
{ {
vulkan::Buffer *ubo=device->CreateUBO(size,data);
if(!ubo)
return(nullptr);
const int index=material->GetUBO(name); const int index=material->GetUBO(name);
if(index<0) if(index<0)
{ return(false);
SAFE_CLEAR(ubo);
return(nullptr);
}
if(!descriptor_sets->BindUBO(index,ubo)) if(!descriptor_sets->BindUBO(index,ubo))
{ return(false);
SAFE_CLEAR(ubo);
return(nullptr);
}
return ubo; return(true);
} }
bool InitUBO() bool InitUBO()
@ -98,9 +85,14 @@ private:
cam.height=extent.height; cam.height=extent.height;
cam.Refresh(); cam.Refresh();
ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix);
if(!ubo_mvp)
return(nullptr);
ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&cam.matrix); BindUBO("world",ubo_mvp);
ubo_mvp_fs =CreateUBO("fragment_world",sizeof(WorldMatrix),&cam.matrix); BindUBO("fragment_world",ubo_mvp);
descriptor_sets->Update(); descriptor_sets->Update();
return(true); return(true);
@ -156,7 +148,6 @@ public:
cam.Refresh(); cam.Refresh();
ubo_mvp->Write(&cam.matrix); ubo_mvp->Write(&cam.matrix);
ubo_mvp_fs->Write(&cam.matrix);
BuildCommandBuffer(pipeline,descriptor_sets,render_obj); BuildCommandBuffer(pipeline,descriptor_sets,render_obj);
} }