From 8436e57ed791c1bb77bc01ade9e4054d1cd304b0 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 6 Jun 2025 00:24:06 +0800 Subject: [PATCH] =?UTF-8?q?RenderResource=E4=B8=AD=E7=A7=BB=E9=99=A4static?= =?UTF-8?q?=5Fdescriptor/global=5Fdescriptor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/graph/VKRenderResource.h | 13 +++---------- inc/hgl/graph/VKRenderTarget.h | 2 +- src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp | 3 --- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index 5ebb2aa7..1b991343 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -54,7 +54,7 @@ class RenderResource IDObjectManage rm_primitives; ///<图元合集 IDObjectManage rm_buffers; ///<顶点缓冲区合集 IDObjectManage rm_samplers; ///<采样器合集 - IDObjectManage rm_renderables; ///<渲染实例集合集 + IDObjectManage rm_renderables; ///<渲染实例集合集 private: @@ -77,16 +77,9 @@ public: VulkanDevice *GetDevice(){return device;} - //注：并非一定要走这里，这里只是提供一个注册和自动绑定的机制 - DescriptorBinding static_descriptor; ///<静态属性描述符绑定管理 - DescriptorBinding global_descriptor; ///<全局属性描述符绑定管理 - public: - RenderResource(VulkanDevice *dev):device(dev), - static_descriptor(DescriptorSetType::Static), - global_descriptor(DescriptorSetType::Global) - {} + RenderResource(VulkanDevice *dev):device(dev){} virtual ~RenderResource()=default; public: //添加数据到管理器（如果指针为nullptr会返回-1） @@ -97,7 +90,7 @@ public: //添加数据到管理器（如果指针为nullptr会返回-1） PrimitiveID Add(Primitive * p ){return rm_primitives.Add(p);} BufferID Add(DeviceBuffer * buf ){return rm_buffers.Add(buf);} SamplerID Add(Sampler * s ){return rm_samplers.Add(s);} - RenderableID Add(Mesh * r ){return rm_renderables.Add(r);} + RenderableID Add(Mesh * r ){return rm_renderables.Add(r);} public: // VAB/VAO diff --git a/inc/hgl/graph/VKRenderTarget.h b/inc/hgl/graph/VKRenderTarget.h index 7c3fc6d9..bef37750 100644 --- a/inc/hgl/graph/VKRenderTarget.h +++ b/inc/hgl/graph/VKRenderTarget.h @@ -29,7 +29,7 @@ class IRenderTarget public: RenderFramework * GetRenderFramework ()const{return render_framework;} - VulkanDevice * GetDevice ()const; + VulkanDevice * GetDevice ()const; VkDevice GetVkDevice ()const; DescriptorBinding * GetDescriptorBinding(){return &desc_binding;} diff --git a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp index d106ab79..4003ddd4 100644 --- a/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp @@ -172,9 +172,6 @@ Material *RenderResource::CreateMaterial(const AnsiString &mtl_name,const mtl::M Add(mtl); - static_descriptor.Bind(mtl); - global_descriptor.Bind(mtl); - material_by_name.Add(mtl_name,mtl); return mtl.Finish(); }