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

use MaterialInstance in Geometry2D&HQFilterTexture

Browse Source
This commit is contained in:
hyzboy 2020-01-20 17:42:30 +08:00
parent 2fceaa4f8b
commit 273885a80e
4 changed files with 79 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 6344eecc073e61241623306949d9cc915a60a338 Subproject commit 8f024e159807b3d4e98c474636fda2b555a364e2

65
example/Vulkan/Geometry2D.cpp
View File

@ -1,4 +1,4 @@
// 3.Geometry2D // Geometry2D
// 该范例有两个作用： // 该范例有两个作用：
// 一、测试绘制2D几何体 // 一、测试绘制2D几何体
// 二、试验动态合并材质渲染机制 // 二、试验动态合并材质渲染机制
@ -20,26 +20,26 @@ bool LoadFromFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc);
constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t SCREEN_HEIGHT=128;
struct WorldConfig static Vector4f color(1,1,0,1);
{
Matrix4f mvp;
}world;
class TestApp:public VulkanApplicationFramework class TestApp:public VulkanApplicationFramework
{ {
Camera cam;
private: private:
SceneNode render_root; SceneNode render_root;
RenderList render_list; RenderList render_list;
vulkan::Material * material =nullptr; vulkan::Material * material =nullptr;
vulkan::DescriptorSets * descriptor_sets =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable *ro_rectangle =nullptr, vulkan::Renderable *ro_rectangle =nullptr,
*ro_circle =nullptr, *ro_circle =nullptr,
*ro_round_rectangle =nullptr; *ro_round_rectangle =nullptr;
vulkan::Buffer * ubo_mvp =nullptr; vulkan::Buffer * ubo_mvp =nullptr;
vulkan::Buffer * ubo_color_material =nullptr;
vulkan::Pipeline * pipeline =nullptr; vulkan::Pipeline * pipeline =nullptr;
@ -48,14 +48,14 @@ private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert.spv"), material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert.spv"),
OS_TEXT("res/shader/drand48.frag.spv")); OS_TEXT("res/shader/FlatColor.frag.spv"));
if(!material) if(!material)
return(false); return(false);
descriptor_sets=material->CreateDescriptorSets(); material_instance=material->CreateInstance();
db->Add(material); db->Add(material);
db->Add(descriptor_sets); db->Add(material_instance);
return(true); return(true);
} }
@ -94,21 +94,35 @@ private:
} }
} }
vulkan::Buffer *CreateUBO(const UTF8String &name,const VkDeviceSize size,void *data)
{
vulkan::Buffer *ubo=device->CreateUBO(size,data);
if(!ubo)
return(nullptr);
if(!material_instance->BindUBO(name,ubo))
{
SAFE_CLEAR(ubo);
return(nullptr);
}
return ubo;
}
bool InitUBO() bool InitUBO()
{ {
const VkExtent2D extent=sc_render_target->GetExtent(); const VkExtent2D extent=sc_render_target->GetExtent();
world.mvp=ortho(extent.width,extent.height); cam.width=extent.width;
cam.height=extent.height;
ubo_mvp=db->CreateUBO(sizeof(WorldConfig),&world); cam.Refresh();
ubo_mvp =CreateUBO("world", sizeof(WorldMatrix),&cam.matrix);
ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color);
if(!ubo_mvp) material_instance->Update();
return(false);
if(!descriptor_sets->BindUBO(material->GetUBO("world"),ubo_mvp))
return(false);
descriptor_sets->Update();
return(true); return(true);
} }
@ -128,9 +142,9 @@ private:
bool InitScene() bool InitScene()
{ {
render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_rectangle)); render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_rectangle));
render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_round_rectangle)); render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_round_rectangle));
render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_circle)); render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_circle));
render_root.ExpendToList(&render_list); render_root.ExpendToList(&render_list);
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
@ -163,6 +177,13 @@ public:
void Resize(int w,int h) override void Resize(int w,int h) override
{ {
cam.width=w;
cam.height=h;
cam.Refresh();
ubo_mvp->Write(&cam.matrix);
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }
};//class TestApp:public VulkanApplicationFramework };//class TestApp:public VulkanApplicationFramework

18
example/Vulkan/HQFilterTexture.cpp
View File

@ -48,10 +48,10 @@ private:
struct MPD struct MPD
{ {
vulkan::Material * material =nullptr; vulkan::Material * material =nullptr;
vulkan::Pipeline * pipeline =nullptr; vulkan::Pipeline * pipeline =nullptr;
vulkan::DescriptorSets * descriptor_sets =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr; vulkan::Renderable * render_obj =nullptr;
public: public:
@ -59,7 +59,7 @@ private:
{ {
delete material; delete material;
delete render_obj; delete render_obj;
delete descriptor_sets; SAFE_CLEAR(material_instance);
delete pipeline; delete pipeline;
} }
}nearest,linear,nearest_hq,linear_hq; }nearest,linear,nearest_hq,linear_hq;
@ -142,10 +142,10 @@ private:
if(!mpd->material) if(!mpd->material)
return(false); return(false);
mpd->descriptor_sets=mpd->material->CreateDescriptorSets(); mpd->material_instance=mpd->material->CreateInstance();
mpd->descriptor_sets->BindSampler(mpd->material->GetSampler("tex"),texture,sampler); mpd->material_instance->BindSampler("tex",texture,sampler);
mpd->descriptor_sets->Update(); mpd->material_instance->Update();
mpd->render_obj=mpd->material->CreateRenderable(VERTEX_COUNT); mpd->render_obj=mpd->material->CreateRenderable(VERTEX_COUNT);
mpd->render_obj->Set("Vertex",vertex_buffer); mpd->render_obj->Set("Vertex",vertex_buffer);
@ -164,7 +164,7 @@ private:
bool Add(struct MPD *mpd,const Matrix4f &offset) bool Add(struct MPD *mpd,const Matrix4f &offset)
{ {
RenderableInstance *ri=db->CreateRenderableInstance(mpd->pipeline,mpd->descriptor_sets,mpd->render_obj); RenderableInstance *ri=db->CreateRenderableInstance(mpd->pipeline,mpd->material_instance->GetDescriptorSets(),mpd->render_obj);
if(!ri)return(false); if(!ri)return(false);

48
inc/hgl/graph/SceneDB.h
View File

@ -13,10 +13,11 @@ namespace hgl
{ {
namespace graph namespace graph
{ {
using MaterialID =int; using MaterialID =int;
using PipelineID =int; using MaterialInstanceID =int;
using BufferID =int; using PipelineID =int;
using DescriptorSetsID =int; using BufferID =int;
using DescriptorSetsID =int;
using RenderableID =int; using RenderableID =int;
using RenderableInstanceID =int; using RenderableInstanceID =int;
@ -29,24 +30,26 @@ namespace hgl
{ {
vulkan::Device *device; vulkan::Device *device;
IDResManage<MaterialID, vulkan::Material> rm_material; ///<材质合集 IDResManage<MaterialID, vulkan::Material> rm_material; ///<材质合集
IDResManage<PipelineID, vulkan::Pipeline> rm_pipeline; ///<管线合集 IDResManage<MaterialInstanceID, vulkan::MaterialInstance> rm_material_instance; ///<材质实例合集
IDResManage<DescriptorSetsID, vulkan::DescriptorSets> rm_desc_sets; ///<描述符合集 IDResManage<PipelineID, vulkan::Pipeline> rm_pipeline; ///<管线合集
IDResManage<RenderableID, vulkan::Renderable> rm_renderables; ///<可渲染对象合集 IDResManage<DescriptorSetsID, vulkan::DescriptorSets> rm_desc_sets; ///<描述符合集
IDResManage<BufferID, vulkan::Buffer> rm_buffers; ///<顶点缓冲区合集 IDResManage<RenderableID, vulkan::Renderable> rm_renderables; ///<可渲染对象合集
IDResManage<RenderableInstanceID, RenderableInstance> rm_renderable_instances; ///<渲染实例集合集 IDResManage<BufferID, vulkan::Buffer> rm_buffers; ///<顶点缓冲区合集
IDResManage<RenderableInstanceID, RenderableInstance> rm_renderable_instances; ///<渲染实例集合集
public: public:
SceneDB(vulkan::Device *dev):device(dev){} SceneDB(vulkan::Device *dev):device(dev){}
virtual ~SceneDB()=default; virtual ~SceneDB()=default;
MaterialID Add(vulkan::Material * mtl ){return rm_material.Add(mtl);} MaterialID Add(vulkan::Material * mtl ){return rm_material.Add(mtl);}
PipelineID Add(vulkan::Pipeline * p ){return rm_pipeline.Add(p);} MaterialInstanceID Add(vulkan::MaterialInstance * mi ){return rm_material_instance.Add(mi);}
DescriptorSetsID Add(vulkan::DescriptorSets *ds ){return rm_desc_sets.Add(ds);} PipelineID Add(vulkan::Pipeline * p ){return rm_pipeline.Add(p);}
RenderableID Add(vulkan::Renderable * r ){return rm_renderables.Add(r);} DescriptorSetsID Add(vulkan::DescriptorSets * ds ){return rm_desc_sets.Add(ds);}
BufferID Add(vulkan::Buffer * buf ){return rm_buffers.Add(buf);} RenderableID Add(vulkan::Renderable * r ){return rm_renderables.Add(r);}
RenderableInstanceID Add(RenderableInstance * ri ){return rm_renderable_instances.Add(ri);} BufferID Add(vulkan::Buffer * buf ){return rm_buffers.Add(buf);}
RenderableInstanceID Add(RenderableInstance * ri ){return rm_renderable_instances.Add(ri);}
vulkan::VertexBuffer *CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); vulkan::VertexBuffer *CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE);
vulkan::VertexBuffer *CreateVBO(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(format,count,nullptr,sharing_mode);} vulkan::VertexBuffer *CreateVBO(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(format,count,nullptr,sharing_mode);}
@ -72,12 +75,13 @@ namespace hgl
RenderableInstance * CreateRenderableInstance(vulkan::Pipeline *p,vulkan::DescriptorSets *ds,vulkan::Renderable *r); RenderableInstance * CreateRenderableInstance(vulkan::Pipeline *p,vulkan::DescriptorSets *ds,vulkan::Renderable *r);
vulkan::Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);} vulkan::Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);}
vulkan::Pipeline * GetPipeline (const PipelineID &id){return rm_pipeline.Get(id);} vulkan::MaterialInstance * GetMaterialInstance (const MaterialInstanceID &id){return rm_material_instance.Get(id);}
vulkan::DescriptorSets *GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);} vulkan::Pipeline * GetPipeline (const PipelineID &id){return rm_pipeline.Get(id);}
vulkan::Renderable * GetRenderable (const RenderableID &id){return rm_renderables.Get(id);} vulkan::DescriptorSets * GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);}
vulkan::Buffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);} vulkan::Renderable * GetRenderable (const RenderableID &id){return rm_renderables.Get(id);}
RenderableInstance * GetRenderableInstance (const RenderableInstanceID &id){return rm_renderable_instances.Get(id);} vulkan::Buffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);}
RenderableInstance * GetRenderableInstance (const RenderableInstanceID &id){return rm_renderable_instances.Get(id);}
};//class SceneDB };//class SceneDB
}//namespace graph }//namespace graph
}//namespace hgl }//namespace hgl