diff --git a/inc/hgl/graph/VK.h b/inc/hgl/graph/VK.h index 78cf3b3e..fec3aac5 100644 --- a/inc/hgl/graph/VK.h +++ b/inc/hgl/graph/VK.h @@ -59,6 +59,18 @@ struct DeviceBufferData; class VertexAttribBuffer; using VBO=VertexAttribBuffer; +struct VBOAccessData +{ + VBO *buf; + VkDeviceSize offset; + +public: + + CompOperatorMemcmp(const VBOAccessData &); +};//struct VBOAccessData + +using VBOAccessMap=Map; + class IndexBuffer; struct IndexBufferData diff --git a/inc/hgl/graph/VKPrimitive.h b/inc/hgl/graph/VKPrimitive.h index 9e6c1e50..be712357 100644 --- a/inc/hgl/graph/VKPrimitive.h +++ b/inc/hgl/graph/VKPrimitive.h @@ -15,17 +15,7 @@ class Primitive GPUDevice *device; AnsiString prim_name; - struct VBOData - { - VBO *buf; - VkDeviceSize offset; - - public: - - CompOperatorMemcmp(const VBOData &); - }; - - Map buffer_list; + VBOAccessMap buffer_list; protected: diff --git a/src/SceneGraph/Vulkan/VKPrimitive.cpp b/src/SceneGraph/Vulkan/VKPrimitive.cpp index 61a227ac..3910ef31 100644 --- a/src/SceneGraph/Vulkan/VKPrimitive.cpp +++ b/src/SceneGraph/Vulkan/VKPrimitive.cpp @@ -32,7 +32,7 @@ bool Primitive::Set(const AnsiString &name,VBO *vbo,VkDeviceSize offset) if(!vbo)return(false); if(buffer_list.KeyExist(name))return(false); - VBOData bd; + VBOAccessData bd; bd.buf=vbo; bd.offset=offset; @@ -57,7 +57,7 @@ VBO *Primitive::GetVBO(const AnsiString &name,VkDeviceSize *offset) if(!offset)return(nullptr); if(name.IsEmpty())return(nullptr); - VBOData bd; + VBOAccessData bd; if(buffer_list.Get(name,bd)) {