From 01a32148bf2de7c6441629d332b14c82b7a35be5 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 16 Jul 2020 12:00:02 +0800 Subject: [PATCH] rename,use CreateVAB instead CreateVBO --- CMPlatform | 2 +- example/Vulkan/DrawText.cpp | 4 ++-- example/Vulkan/FragCoordTest.cpp | 2 +- example/Vulkan/HQFilterTexture.cpp | 4 ++-- example/Vulkan/LoadStaticMesh.cpp | 8 ++++---- example/Vulkan/RectanglePrimitive.cpp | 4 ++-- example/Vulkan/TextureFormat.cpp | 2 +- example/Vulkan/first_triangle.cpp | 4 ++-- example/Vulkan/indices_rect.cpp | 6 +++--- example/Vulkan/texture_rect.cpp | 4 ++-- inc/hgl/graph/SceneDB.h | 6 +++--- inc/hgl/graph/vulkan/VKBuffer.h | 2 +- inc/hgl/graph/vulkan/VKDevice.h | 6 +++--- src/RenderDevice/Vulkan/VKDeviceBuffer.cpp | 2 +- src/SceneGraph/InlineGeometry.cpp | 2 +- src/SceneGraph/SceneDB.cpp | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CMPlatform b/CMPlatform index c041a934..f5117f0a 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit c041a934174d21e75a37d1315abcd8f89503f5e6 +Subproject commit f5117f0a84958defd11c337e512bd0a32bc9efca diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index c69a41cf..cf5ffda5 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -82,8 +82,8 @@ private: void InitVBO() { - vertex_buffer =db->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,vertex_data); - tex_coord_buffer=db->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,tex_coord_data); + vertex_buffer =db->CreateVAB(FMT_RGBA32F,VERTEX_COUNT,vertex_data); + tex_coord_buffer=db->CreateVAB(FMT_RGBA32F,VERTEX_COUNT,tex_coord_data); render_obj->Set("Vertex",vertex_buffer); render_obj->Set("TexCoord",tex_coord_buffer); diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index 49fbc176..f144c094 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -87,7 +87,7 @@ private: void InitVBO() { - vertex_buffer =device->CreateVBO(FMT_RG32F, VERTEX_COUNT,vertex_data); + vertex_buffer =device->CreateVAB(FMT_RG32F, VERTEX_COUNT,vertex_data); render_obj->Set("Vertex", vertex_buffer); } diff --git a/example/Vulkan/HQFilterTexture.cpp b/example/Vulkan/HQFilterTexture.cpp index ee1e6d96..549bd827 100644 --- a/example/Vulkan/HQFilterTexture.cpp +++ b/example/Vulkan/HQFilterTexture.cpp @@ -91,10 +91,10 @@ private: bool InitVBO() { - vertex_buffer =device->CreateVBO(FMT_RG32F,VERTEX_COUNT,vertex_data); + vertex_buffer =device->CreateVAB(FMT_RG32F,VERTEX_COUNT,vertex_data); if(!vertex_buffer)return(false); - tex_coord_buffer=device->CreateVBO(FMT_RG32F,VERTEX_COUNT,tex_coord_data); + tex_coord_buffer=device->CreateVAB(FMT_RG32F,VERTEX_COUNT,tex_coord_data); if(!tex_coord_buffer)return(false); index_buffer =device->CreateIBO16(INDEX_COUNT,index_data); diff --git a/example/Vulkan/LoadStaticMesh.cpp b/example/Vulkan/LoadStaticMesh.cpp index fb595339..2f424991 100644 --- a/example/Vulkan/LoadStaticMesh.cpp +++ b/example/Vulkan/LoadStaticMesh.cpp @@ -36,7 +36,7 @@ vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const if(vertex_binding==-1) return(nullptr); - vulkan::VertexAttribBuffer *vbo=db->CreateVBO(FMT_RGB32F,mesh->vertex_count,mesh->position); + vulkan::VertexAttribBuffer *vbo=db->CreateVAB(FMT_RGB32F,mesh->vertex_count,mesh->position); render_obj=mtl->CreateRenderable(); render_obj->Set(vertex_binding,vbo); @@ -47,7 +47,7 @@ vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const if(normal_binding!=-1) { - vulkan::VertexAttribBuffer *vbo=db->CreateVBO(FMT_RGB32F,mesh->vertex_count,mesh->normal); + vulkan::VertexAttribBuffer *vbo=db->CreateVAB(FMT_RGB32F,mesh->vertex_count,mesh->normal); render_obj->Set(normal_binding,vbo); } @@ -56,7 +56,7 @@ vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const if(tagent_binding!=-1) { - vulkan::VertexAttribBuffer *vbo=db->CreateVBO(FMT_RGB32F,mesh->vertex_count,mesh->tangent); + vulkan::VertexAttribBuffer *vbo=db->CreateVAB(FMT_RGB32F,mesh->vertex_count,mesh->tangent); render_obj->Set(tagent_binding,vbo); } @@ -65,7 +65,7 @@ vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const if(bitagent_binding!=-1) { - vulkan::VertexAttribBuffer *vbo=db->CreateVBO(FMT_RGB32F,mesh->vertex_count,mesh->bitangent); + vulkan::VertexAttribBuffer *vbo=db->CreateVAB(FMT_RGB32F,mesh->vertex_count,mesh->bitangent); render_obj->Set(bitagent_binding,vbo); } diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 6abbfc00..999987e6 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -95,8 +95,8 @@ private: void InitVBO() { - vertex_buffer =db->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,vertex_data); - tex_coord_buffer=db->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,tex_coord_data); + vertex_buffer =db->CreateVAB(FMT_RGBA32F,VERTEX_COUNT,vertex_data); + tex_coord_buffer=db->CreateVAB(FMT_RGBA32F,VERTEX_COUNT,tex_coord_data); render_obj->Set("Vertex",vertex_buffer); render_obj->Set("TexCoord",tex_coord_buffer); diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index 9ff9dc93..4b5f4d19 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -56,7 +56,7 @@ vulkan::Instance *InitVulkanInstance() cili.lunarg.standard_validation=true; cili.khronos.validation=true; - return vulkan::CreateInstance(U8_TEXT("VulkanTest"),nullptr,&cili); + return vulkan::CreateInstance("VulkanTest",nullptr,&cili); } int main(int,char **) diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 14c19231..75d2701f 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -93,8 +93,8 @@ private: bool InitVBO() { - vertex_buffer =device->CreateVBO(FMT_RG32F, VERTEX_COUNT,vertex_data); - color_buffer =device->CreateVBO(FMT_RGB32F, VERTEX_COUNT,color_data); + vertex_buffer =device->CreateVAB(FMT_RG32F, VERTEX_COUNT,vertex_data); + color_buffer =device->CreateVAB(FMT_RGB32F, VERTEX_COUNT,color_data); if(!render_obj->Set("Vertex", vertex_buffer))return(false); if(!render_obj->Set("Color", color_buffer))return(false); diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index 62d27007..507c5e06 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -24,7 +24,7 @@ constexpr float vertex_data[VERTEX_COUNT][2]= {SCREEN_WIDTH*SSP, SCREEN_HEIGHT*SSN}, {SCREEN_WIDTH*SSN, SCREEN_HEIGHT*SSN} }; - + constexpr uint32_t INDEX_COUNT=6; constexpr uint16 index_data[INDEX_COUNT]= @@ -69,7 +69,7 @@ private: bool InitMaterial() { material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert"), - OS_TEXT("res/shader/XorColor.frag")); + OS_TEXT("res/shader/HexGrid.frag")); if(!material) return(false); @@ -99,7 +99,7 @@ private: void InitVBO() { - vertex_buffer =device->CreateVBO(FMT_RG32F,VERTEX_COUNT,vertex_data); + vertex_buffer =device->CreateVAB(FMT_RG32F,VERTEX_COUNT,vertex_data); index_buffer =device->CreateIBO16(INDEX_COUNT,index_data); render_obj->Set("Vertex",vertex_buffer); diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index f139d431..baff9bb9 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -119,8 +119,8 @@ private: void InitVBO() { - vertex_buffer =device->CreateVBO(FMT_RG32F,VERTEX_COUNT,vertex_data); - tex_coord_buffer=device->CreateVBO(FMT_RG32F,VERTEX_COUNT,tex_coord_data); + vertex_buffer =device->CreateVAB(FMT_RG32F,VERTEX_COUNT,vertex_data); + tex_coord_buffer=device->CreateVAB(FMT_RG32F,VERTEX_COUNT,tex_coord_data); index_buffer =device->CreateIBO16(INDEX_COUNT,index_data); render_obj->Set("Vertex",vertex_buffer); diff --git a/inc/hgl/graph/SceneDB.h b/inc/hgl/graph/SceneDB.h index c5fca0ff..630fa4fb 100644 --- a/inc/hgl/graph/SceneDB.h +++ b/inc/hgl/graph/SceneDB.h @@ -64,9 +64,9 @@ namespace hgl public: //Create - vulkan::VertexAttribBuffer *CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); - vulkan::VertexAttribBuffer *CreateVBO(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(format,count,nullptr,sharing_mode);} - vulkan::VertexAttribBuffer *CreateVBO(const VertexAttribBufferCreater *vbc,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(vbc->GetDataType(),vbc->GetCount(),vbc->GetData(),sharing_mode);} + vulkan::VertexAttribBuffer *CreateVAB(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); + vulkan::VertexAttribBuffer *CreateVAB(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVAB(format,count,nullptr,sharing_mode);} + vulkan::VertexAttribBuffer *CreateVAB(const VertexAttribBufferCreater *vbc,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVAB(vbc->GetDataType(),vbc->GetCount(),vbc->GetData(),sharing_mode);} #define SCENE_DB_CREATE_FUNC(name) vulkan::Buffer *Create##name(VkDeviceSize size,void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); \ vulkan::Buffer *Create##name(VkDeviceSize size,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); diff --git a/inc/hgl/graph/vulkan/VKBuffer.h b/inc/hgl/graph/vulkan/VKBuffer.h index e2b41d5c..e9a584d8 100644 --- a/inc/hgl/graph/vulkan/VKBuffer.h +++ b/inc/hgl/graph/vulkan/VKBuffer.h @@ -9,7 +9,7 @@ struct BufferData VkBuffer buffer; Memory * memory=nullptr; VkDescriptorBufferInfo info; -};//struct VulkanBuffer +};//struct BufferData class Buffer { diff --git a/inc/hgl/graph/vulkan/VKDevice.h b/inc/hgl/graph/vulkan/VKDevice.h index ce0b5560..25e03057 100644 --- a/inc/hgl/graph/vulkan/VKDevice.h +++ b/inc/hgl/graph/vulkan/VKDevice.h @@ -87,9 +87,9 @@ public: //Buffer相关 Buffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); Buffer * CreateBuffer(VkBufferUsageFlags buf_usage,VkDeviceSize size,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateBuffer(buf_usage,size,nullptr,sharing_mode);} - VertexAttribBuffer * CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); - VertexAttribBuffer * CreateVBO(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(format,count,nullptr,sharing_mode);} - VertexAttribBuffer * CreateVBO(const VertexAttribBufferCreater *vbc,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVBO(vbc->GetDataType(),vbc->GetCount(),vbc->GetData(),sharing_mode);} + VertexAttribBuffer * CreateVAB(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); + VertexAttribBuffer * CreateVAB(VkFormat format,uint32_t count,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVAB(format,count,nullptr,sharing_mode);} + VertexAttribBuffer * CreateVAB(const VertexAttribBufferCreater *vbc,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateVAB(vbc->GetDataType(),vbc->GetCount(),vbc->GetData(),sharing_mode);} IndexBuffer * CreateIBO(VkIndexType index_type,uint32_t count,const void *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE); IndexBuffer * CreateIBO16(uint32_t count,const uint16 *data,VkSharingMode sharing_mode=VK_SHARING_MODE_EXCLUSIVE){return CreateIBO(VK_INDEX_TYPE_UINT16,count,(void *)data,sharing_mode);} diff --git a/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp b/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp index 8d6c7069..36bebb46 100644 --- a/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceBuffer.cpp @@ -44,7 +44,7 @@ bool Device::CreateBuffer(BufferData *buf,VkBufferUsageFlags buf_usage,VkDeviceS return(false); } -VertexAttribBuffer *Device::CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode) +VertexAttribBuffer *Device::CreateVAB(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode) { const uint32_t stride=GetStrideByFormat(format); diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index e48639f5..9ddbda68 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -105,7 +105,7 @@ namespace hgl void Finish(int binding,VertexAttribBufferCreater *vb) { - render_obj->Set(binding,db->CreateVBO(vb)); + render_obj->Set(binding,db->CreateVAB(vb)); delete vb; } diff --git a/src/SceneGraph/SceneDB.cpp b/src/SceneGraph/SceneDB.cpp index dd22cb7a..dc28abb7 100644 --- a/src/SceneGraph/SceneDB.cpp +++ b/src/SceneGraph/SceneDB.cpp @@ -6,9 +6,9 @@ namespace hgl { namespace graph { - vulkan::VertexAttribBuffer *SceneDB::CreateVBO(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode) + vulkan::VertexAttribBuffer *SceneDB::CreateVAB(VkFormat format,uint32_t count,const void *data,VkSharingMode sharing_mode) { - vulkan::VertexAttribBuffer *vb=device->CreateVBO(format,count,data,sharing_mode); + vulkan::VertexAttribBuffer *vb=device->CreateVAB(format,count,data,sharing_mode); if(!vb) return(nullptr);