diff --git a/inc/hgl/graph/VKArrayBuffer.h b/inc/hgl/graph/VKArrayBuffer.h index 62920adc..74277d7c 100644 --- a/inc/hgl/graph/VKArrayBuffer.h +++ b/inc/hgl/graph/VKArrayBuffer.h @@ -2,7 +2,7 @@ #define HGL_GRAPH_VULKAN_ARRAY_BUFFER_INCLUDE #include -#include +#include namespace hgl { class Collection; @@ -50,26 +50,26 @@ namespace hgl void Clear(); template - bool Start(UBODynamicAccess *ubo_access,const uint32 start,const uint32 count) + bool Start(DynamicBufferAccess *dba,const uint32 start,const uint32 count) { - if(!ubo_access)return(false); + if(!dba)return(false); void *ptr=Map(start,count); if(!ptr)return(false); - ubo_access->Start((uchar *)ptr,align_size,count); + dba->Start((uchar *)ptr,align_size,count); return(true); } template - void End(UBODynamicAccess *ubo_access) + void End(DynamicBufferAccess *dba) { - if(!ubo_access)return; + if(!dba)return; - Flush(ubo_access->GetCount()); + Flush(dba->GetCount()); - ubo_access->Restart(); + dba->Restart(); } };//class GPUArrayBuffer }//namespace graph diff --git a/inc/hgl/graph/VKUBODynamic.h b/inc/hgl/graph/VKDynamicBufferAccess.h similarity index 67% rename from inc/hgl/graph/VKUBODynamic.h rename to inc/hgl/graph/VKDynamicBufferAccess.h index 74240e67..44a4e22c 100644 --- a/inc/hgl/graph/VKUBODynamic.h +++ b/inc/hgl/graph/VKDynamicBufferAccess.h @@ -1,22 +1,21 @@ -#ifndef HGL_GRAPH_UBO_DYNAMIC_INCLUDE -#define HGL_GRAPH_UBO_DYNAMIC_INCLUDE +#ifndef HGL_GRAPH_DYNAMIC_BUFFER_ACCESS_INCLUDE +#define HGL_GRAPH_DYNAMIC_BUFFER_ACCESS_INCLUDE #include VK_NAMESPACE_BEGIN - -template class UBODynamicAccess +template class DynamicBufferAccess { uchar *pointer; uchar *current; - uint unit_size; + uint align_size; uint count; uint index; private: - UBODynamicAccess() + DynamicBufferAccess() { Restart(); } @@ -25,15 +24,15 @@ private: { pointer=nullptr; current=nullptr; - unit_size=0; + align_size=0; count=0; index=0; } - void Start(uchar *buf,const uint us,const uint c) + void Start(uchar *buf,const uint as,const uint c) { current=pointer=buf; - unit_size=us; + align_size=as; count=c; index=0; } @@ -44,7 +43,7 @@ public: const uint GetCount()const{return count;} const uint GetCurrentIndex()const{return index;} - const uint GetOffsetBytes()const{return index*unit_size;} + const uint GetOffsetBytes()const{return index*align_size;} bool Write(uchar *src) { @@ -52,7 +51,7 @@ public: if(index>=count)return(false); memcpy(current,src,sizeof(T)); - current+=unit_size; + current+=align_size; ++index; return(true); @@ -67,7 +66,7 @@ public: for(uint i=0;i class UBODynamicAccess +};//template class DynamicBufferAccess VK_NAMESPACE_END -#endif//HGL_GRAPH_UBO_DYNAMIC_INCLUDE +#endif//HGL_GRAPH_DYNAMIC_BUFFER_ACCESS_INCLUDE diff --git a/src/SceneGraph/CMakeLists.txt b/src/SceneGraph/CMakeLists.txt index 4616713f..d67a2b66 100644 --- a/src/SceneGraph/CMakeLists.txt +++ b/src/SceneGraph/CMakeLists.txt @@ -185,7 +185,7 @@ SET(VK_MATERIAL_SOURCE ${SG_INCLUDE_PATH}/VKMaterial.h ${SG_INCLUDE_PATH}/VKMaterialParameters.h ${SG_INCLUDE_PATH}/VKMaterialInstance.h ${SG_INCLUDE_PATH}/VKDescriptorBindingManage.h - ${SG_INCLUDE_PATH}/VKUBODynamic.h + ${SG_INCLUDE_PATH}/VKDynamicBufferAccess.h Vulkan/VKDescriptorBindingManage.cpp Vulkan/VKMaterial.cpp Vulkan/VKMaterialParameters.cpp diff --git a/src/SceneGraph/RenderList.cpp b/src/SceneGraph/RenderList.cpp index 45d69787..cc5ffc7e 100644 --- a/src/SceneGraph/RenderList.cpp +++ b/src/SceneGraph/RenderList.cpp @@ -124,7 +124,7 @@ namespace hgl } { - ubo_align=mvp_array->GetUnitSize(); + ubo_align=mvp_array->GetAlignSize(); char *mp=(char *)(mvp_array->Map(0,count)); Renderable **ri=ri_list.GetData(); diff --git a/src/SceneGraph/RenderList2D.cpp b/src/SceneGraph/RenderList2D.cpp index 2364571c..26cd9a6d 100644 --- a/src/SceneGraph/RenderList2D.cpp +++ b/src/SceneGraph/RenderList2D.cpp @@ -125,7 +125,7 @@ namespace hgl } { -// ubo_align=mvp_array->GetUnitSize(); +// ubo_align=mvp_array->GetAlignSize(); // char *mp=(char *)(mvp_array->Map(0,count)); Renderable **ri=ri_list.GetData();