From 2ac749bf95815ab95f7d0b48d10419420fb1cf60 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Wed, 13 Nov 2019 16:10:42 +0800 Subject: [PATCH] =?UTF-8?q?VKInstance=E7=B1=BB=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84ExtList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/graph/vulkan/VKInstance.h | 5 +---- src/RenderDevice/Vulkan/VKInstance.cpp | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/inc/hgl/graph/vulkan/VKInstance.h b/inc/hgl/graph/vulkan/VKInstance.h index 08b903b7..3651dddb 100644 --- a/inc/hgl/graph/vulkan/VKInstance.h +++ b/inc/hgl/graph/vulkan/VKInstance.h @@ -14,15 +14,13 @@ VK_NAMESPACE_BEGIN VKDebugOut *debug_out; - CharPointerList ext_list; - ObjectList physical_devices; private: friend Instance *CreateInstance(const UTF8String &app_name,VKDebugOut *out=nullptr); - Instance(VkInstance,CharPointerList &,VKDebugOut *); + Instance(VkInstance,VKDebugOut *); public: @@ -30,7 +28,6 @@ VK_NAMESPACE_BEGIN operator VkInstance (){return inst;} - const CharPointerList & GetExtList ()const {return ext_list;} const ObjectList &GetDeviceList ()const {return physical_devices;} const PhysicalDevice * GetDevice (VkPhysicalDeviceType)const; };//class Instance diff --git a/src/RenderDevice/Vulkan/VKInstance.cpp b/src/RenderDevice/Vulkan/VKInstance.cpp index 042018b8..a75068d5 100644 --- a/src/RenderDevice/Vulkan/VKInstance.cpp +++ b/src/RenderDevice/Vulkan/VKInstance.cpp @@ -48,16 +48,15 @@ Instance *CreateInstance(const UTF8String &app_name,VKDebugOut *out) out=new VKDebugOut; out->Init(inst); - return(new Instance(inst,ext_list,out)); + return(new Instance(inst,out)); } return(nullptr); } -Instance::Instance(VkInstance i,CharPointerList &el,VKDebugOut *out) +Instance::Instance(VkInstance i,VKDebugOut *out) { inst=i; - ext_list=el; debug_out=out;