From 273885a80e1408a37c29e1b8f646bb31211ff3b9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Mon, 20 Jan 2020 17:42:30 +0800 Subject: [PATCH] use MaterialInstance in Geometry2D&HQFilterTexture --- CMCore | 2 +- example/Vulkan/Geometry2D.cpp | 65 ++++++++++++++++++++---------- example/Vulkan/HQFilterTexture.cpp | 18 ++++----- inc/hgl/graph/SceneDB.h | 48 ++++++++++++---------- 4 files changed, 79 insertions(+), 54 deletions(-) diff --git a/CMCore b/CMCore index 6344eecc..8f024e15 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 6344eecc073e61241623306949d9cc915a60a338 +Subproject commit 8f024e159807b3d4e98c474636fda2b555a364e2 diff --git a/example/Vulkan/Geometry2D.cpp b/example/Vulkan/Geometry2D.cpp index 22552300..1b649865 100644 --- a/example/Vulkan/Geometry2D.cpp +++ b/example/Vulkan/Geometry2D.cpp @@ -1,4 +1,4 @@ -// 3.Geometry2D +// Geometry2D // 该范例有两个作用： // 一、测试绘制2D几何体 // 二、试验动态合并材质渲染机制 @@ -20,26 +20,26 @@ bool LoadFromFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc); constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_HEIGHT=128; -struct WorldConfig -{ - Matrix4f mvp; -}world; +static Vector4f color(1,1,0,1); class TestApp:public VulkanApplicationFramework { + Camera cam; + private: SceneNode render_root; RenderList render_list; vulkan::Material * material =nullptr; - vulkan::DescriptorSets * descriptor_sets =nullptr; + vulkan::MaterialInstance * material_instance =nullptr; vulkan::Renderable *ro_rectangle =nullptr, *ro_circle =nullptr, *ro_round_rectangle =nullptr; vulkan::Buffer * ubo_mvp =nullptr; + vulkan::Buffer * ubo_color_material =nullptr; vulkan::Pipeline * pipeline =nullptr; @@ -48,14 +48,14 @@ private: bool InitMaterial() { 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) return(false); - - descriptor_sets=material->CreateDescriptorSets(); + + material_instance=material->CreateInstance(); db->Add(material); - db->Add(descriptor_sets); + db->Add(material_instance); 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() { 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) - return(false); - - if(!descriptor_sets->BindUBO(material->GetUBO("world"),ubo_mvp)) - return(false); - - descriptor_sets->Update(); + material_instance->Update(); return(true); } @@ -128,9 +142,9 @@ private: bool InitScene() { - render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_rectangle)); - render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_round_rectangle)); - render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_circle)); + render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_rectangle)); + render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_round_rectangle)); + render_root.Add(db->CreateRenderableInstance(pipeline,material_instance->GetDescriptorSets(),ro_circle)); render_root.ExpendToList(&render_list); BuildCommandBuffer(&render_list); @@ -163,6 +177,13 @@ public: void Resize(int w,int h) override { + cam.width=w; + cam.height=h; + + cam.Refresh(); + + ubo_mvp->Write(&cam.matrix); + BuildCommandBuffer(&render_list); } };//class TestApp:public VulkanApplicationFramework diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index c94cefe1..109d0afc 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -48,10 +48,10 @@ private: struct MPD { - vulkan::Material * material =nullptr; - vulkan::Pipeline * pipeline =nullptr; - vulkan::DescriptorSets * descriptor_sets =nullptr; - vulkan::Renderable * render_obj =nullptr; + vulkan::Material * material =nullptr; + vulkan::Pipeline * pipeline =nullptr; + vulkan::MaterialInstance * material_instance =nullptr; + vulkan::Renderable * render_obj =nullptr; public: @@ -59,7 +59,7 @@ private: { delete material; delete render_obj; - delete descriptor_sets; + SAFE_CLEAR(material_instance); delete pipeline; } }nearest,linear,nearest_hq,linear_hq; @@ -142,10 +142,10 @@ private: if(!mpd->material) 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->descriptor_sets->Update(); + mpd->material_instance->BindSampler("tex",texture,sampler); + mpd->material_instance->Update(); mpd->render_obj=mpd->material->CreateRenderable(VERTEX_COUNT); mpd->render_obj->Set("Vertex",vertex_buffer); @@ -164,7 +164,7 @@ private: 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); diff --git a/inc/hgl/graph/SceneDB.h b/inc/hgl/graph/SceneDB.h index a6d624db..1cb6bbb4 100644 --- a/inc/hgl/graph/SceneDB.h +++ b/inc/hgl/graph/SceneDB.h @@ -13,10 +13,11 @@ namespace hgl { namespace graph { - using MaterialID =int; - using PipelineID =int; - using BufferID =int; - using DescriptorSetsID =int; + using MaterialID =int; + using MaterialInstanceID =int; + using PipelineID =int; + using BufferID =int; + using DescriptorSetsID =int; using RenderableID =int; using RenderableInstanceID =int; @@ -29,24 +30,26 @@ namespace hgl { vulkan::Device *device; - IDResManage rm_material; ///<材质合集 - IDResManage rm_pipeline; ///<管线合集 - IDResManage rm_desc_sets; ///<描述符合集 - IDResManage rm_renderables; ///<可渲染对象合集 - IDResManage rm_buffers; ///<顶点缓冲区合集 - IDResManage rm_renderable_instances; ///<渲染实例集合集 + IDResManage rm_material; ///<材质合集 + IDResManage rm_material_instance; ///<材质实例合集 + IDResManage rm_pipeline; ///<管线合集 + IDResManage rm_desc_sets; ///<描述符合集 + IDResManage rm_renderables; ///<可渲染对象合集 + IDResManage rm_buffers; ///<顶点缓冲区合集 + IDResManage rm_renderable_instances; ///<渲染实例集合集 public: SceneDB(vulkan::Device *dev):device(dev){} virtual ~SceneDB()=default; - MaterialID Add(vulkan::Material * mtl ){return rm_material.Add(mtl);} - PipelineID Add(vulkan::Pipeline * p ){return rm_pipeline.Add(p);} - DescriptorSetsID Add(vulkan::DescriptorSets *ds ){return rm_desc_sets.Add(ds);} - RenderableID Add(vulkan::Renderable * r ){return rm_renderables.Add(r);} - BufferID Add(vulkan::Buffer * buf ){return rm_buffers.Add(buf);} - RenderableInstanceID Add(RenderableInstance * ri ){return rm_renderable_instances.Add(ri);} + MaterialID Add(vulkan::Material * mtl ){return rm_material.Add(mtl);} + MaterialInstanceID Add(vulkan::MaterialInstance * mi ){return rm_material_instance.Add(mi);} + PipelineID Add(vulkan::Pipeline * p ){return rm_pipeline.Add(p);} + DescriptorSetsID Add(vulkan::DescriptorSets * ds ){return rm_desc_sets.Add(ds);} + RenderableID Add(vulkan::Renderable * r ){return rm_renderables.Add(r);} + 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,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); - vulkan::Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);} - vulkan::Pipeline * GetPipeline (const PipelineID &id){return rm_pipeline.Get(id);} - vulkan::DescriptorSets *GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);} - vulkan::Renderable * GetRenderable (const RenderableID &id){return rm_renderables.Get(id);} - vulkan::Buffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);} - RenderableInstance * GetRenderableInstance (const RenderableInstanceID &id){return rm_renderable_instances.Get(id);} + vulkan::Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);} + vulkan::MaterialInstance * GetMaterialInstance (const MaterialInstanceID &id){return rm_material_instance.Get(id);} + vulkan::Pipeline * GetPipeline (const PipelineID &id){return rm_pipeline.Get(id);} + vulkan::DescriptorSets * GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);} + vulkan::Renderable * GetRenderable (const RenderableID &id){return rm_renderables.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 }//namespace graph }//namespace hgl