From 49062baf7503b88f8b39d383d222cc1d8185dd54 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 25 Jul 2020 18:53:50 +0800 Subject: [PATCH] code layout --- CMCore | 2 +- CMSceneGraph | 2 +- inc/hgl/graph/vulkan/VKImageView.h | 7 ++++- inc/hgl/graph/vulkan/VKTexture.h | 28 +++++++++---------- .../Vulkan/POD/VKTextureLoader.cpp | 4 +-- src/RenderDevice/Vulkan/VKImageView.cpp | 22 +++++++-------- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/CMCore b/CMCore index 081c7fd9..5d9ccb11 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 081c7fd931f5504fc6fa9177e812f7810bdbb93a +Subproject commit 5d9ccb11bdfd626b5ed51549edb05fd5fa73a636 diff --git a/CMSceneGraph b/CMSceneGraph index 125f0a6d..7a07f280 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 125f0a6d1a6b0471feb89dd8706d71ec71041c06 +Subproject commit 7a07f280f1c82dfbc4a9964556b34c87d5e62cb4 diff --git a/inc/hgl/graph/vulkan/VKImageView.h b/inc/hgl/graph/vulkan/VKImageView.h index ae41c15b..ac8061b8 100644 --- a/inc/hgl/graph/vulkan/VKImageView.h +++ b/inc/hgl/graph/vulkan/VKImageView.h @@ -46,7 +46,12 @@ public: ImageView *CreateImageView(VkDevice device,VkImageViewType type,VkFormat format,const VkExtent3D &ext,VkImageAspectFlags aspectMask,VkImage img); -#define CREATE_IMAGE_VIEW(short_name,larget_name) inline ImageView *CreateImageView##short_name(VkDevice device,VkFormat format,const VkExtent3D &ext,VkImageAspectFlags aspectMask,VkImage img=VK_NULL_HANDLE){return CreateImageView(device,VK_IMAGE_VIEW_TYPE_##larget_name,format,ext,aspectMask,img);} +#define CREATE_IMAGE_VIEW(short_name,larget_name) \ + inline ImageView *CreateImageView##short_name(VkDevice device,VkFormat format,const VkExtent3D &ext,VkImageAspectFlags aspectMask,VkImage img=VK_NULL_HANDLE) \ + { \ + return CreateImageView(device,VK_IMAGE_VIEW_TYPE_##larget_name,format,ext,aspectMask,img); \ + } + CREATE_IMAGE_VIEW(1D,1D); CREATE_IMAGE_VIEW(2D,2D); CREATE_IMAGE_VIEW(3D,3D); diff --git a/inc/hgl/graph/vulkan/VKTexture.h b/inc/hgl/graph/vulkan/VKTexture.h index 41affce7..957f0c5c 100644 --- a/inc/hgl/graph/vulkan/VKTexture.h +++ b/inc/hgl/graph/vulkan/VKTexture.h @@ -24,23 +24,23 @@ protected: public: - TextureData * GetData (){return data;} + TextureData * GetData () {return data;} - VkDeviceMemory GetDeviceMemory (){return data?data->memory->operator VkDeviceMemory():VK_NULL_HANDLE;} - VkImage GetImage (){return data?data->image:VK_NULL_HANDLE;} - VkImageLayout GetImageLayout (){return data?data->image_layout:VK_IMAGE_LAYOUT_UNDEFINED;} - VkImageView GetVulkanImageView (){return data?data->image_view->operator VkImageView():VK_NULL_HANDLE;} + VkDeviceMemory GetDeviceMemory () {return data?data->memory->operator VkDeviceMemory():VK_NULL_HANDLE;} + VkImage GetImage () {return data?data->image:VK_NULL_HANDLE;} + VkImageLayout GetImageLayout () {return data?data->image_layout:VK_IMAGE_LAYOUT_UNDEFINED;} + VkImageView GetVulkanImageView () {return data?data->image_view->operator VkImageView():VK_NULL_HANDLE;} - Memory * GetMemory (){return data?data->memory:nullptr;} - ImageView * GetImageView (){return data?data->image_view:nullptr;} + Memory * GetMemory () {return data?data->memory:nullptr;} + ImageView * GetImageView () {return data?data->image_view:nullptr;} - const uint32 GetMipLevels()const{return data?data->mip_levels:0;} - const bool IsOptimal ()const{return data?data->tiling==VK_IMAGE_TILING_OPTIMAL:false;} - const bool IsLinear ()const{return data?data->tiling==VK_IMAGE_TILING_LINEAR:false;} + const uint32 GetMipLevels ()const {return data?data->mip_levels:0;} + const bool IsOptimal ()const {return data?data->tiling==VK_IMAGE_TILING_OPTIMAL:false;} + const bool IsLinear ()const {return data?data->tiling==VK_IMAGE_TILING_LINEAR:false;} - const VkFormat GetFormat ()const{return data?data->image_view->GetFormat():VK_FORMAT_UNDEFINED;} - const VkImageAspectFlags GetAspect ()const{return data?data->image_view->GetAspectFlags():0;} - const VkExtent3D * GetExtent ()const{return data?&data->image_view->GetExtent():nullptr;} + const VkFormat GetFormat ()const {return data?data->image_view->GetFormat():VK_FORMAT_UNDEFINED;} + const VkImageAspectFlags GetAspect ()const {return data?data->image_view->GetAspectFlags():0;} + const VkExtent3D * GetExtent ()const {return data?&data->image_view->GetExtent():nullptr;} public: @@ -70,7 +70,7 @@ public: Texture2D(VkDevice dev,TextureData *td):Texture(dev,td){} ~Texture2D()=default; - const uint32_t GetWidth()const{return data?data->image_view->GetExtent().width:0;} + const uint32_t GetWidth ()const{return data?data->image_view->GetExtent().width:0;} const uint32_t GetHeight()const{return data?data->image_view->GetExtent().height:0;} };//class Texture2D:public Texture diff --git a/src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp b/src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp index 65e830ea..aeb49d57 100644 --- a/src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp +++ b/src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp @@ -157,7 +157,7 @@ Texture2D *CreateTextureFromFile(Device *device,const OSString &filename) return tex; } } -/* + struct Texture2DData { uint32 width; @@ -219,5 +219,5 @@ void *LoadTextureFromFile(const OSString &filename) delete buf; return tex; } -}*/ +} VK_NAMESPACE_END diff --git a/src/RenderDevice/Vulkan/VKImageView.cpp b/src/RenderDevice/Vulkan/VKImageView.cpp index e544de5f..48e89c99 100644 --- a/src/RenderDevice/Vulkan/VKImageView.cpp +++ b/src/RenderDevice/Vulkan/VKImageView.cpp @@ -10,17 +10,17 @@ ImageView *CreateImageView(VkDevice device,VkImageViewType type,VkFormat format, { VkImageViewCreateInfo iv_createinfo={}; - iv_createinfo.sType=VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; - iv_createinfo.pNext=nullptr; - iv_createinfo.flags=0; - iv_createinfo.image=img; - iv_createinfo.format=format; - iv_createinfo.viewType=type; - iv_createinfo.subresourceRange.aspectMask=aspectMask; - iv_createinfo.subresourceRange.baseMipLevel=0; - iv_createinfo.subresourceRange.levelCount=ext.depth; - iv_createinfo.subresourceRange.baseArrayLayer=0; - iv_createinfo.subresourceRange.layerCount=ext.depth; + iv_createinfo.sType =VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + iv_createinfo.pNext =nullptr; + iv_createinfo.flags =0; + iv_createinfo.image =img; + iv_createinfo.format =format; + iv_createinfo.viewType =type; + iv_createinfo.subresourceRange.aspectMask =aspectMask; + iv_createinfo.subresourceRange.baseMipLevel =0; + iv_createinfo.subresourceRange.levelCount =ext.depth; + iv_createinfo.subresourceRange.baseArrayLayer =0; + iv_createinfo.subresourceRange.layerCount =ext.depth; if(aspectMask&VK_IMAGE_ASPECT_DEPTH_BIT) {