hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code layout

Browse Source
This commit is contained in:
hyzboy 2020-07-25 18:53:50 +08:00
parent 8669ed77d0
commit 49062baf75
6 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 081c7fd931f5504fc6fa9177e812f7810bdbb93a
Subproject commit 5d9ccb11bdfd626b5ed51549edb05fd5fa73a636

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 125f0a6d1a6b0471feb89dd8706d71ec71041c06
Subproject commit 7a07f280f1c82dfbc4a9964556b34c87d5e62cb4

7
inc/hgl/graph/vulkan/VKImageView.h
View File

@ -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);

28
inc/hgl/graph/vulkan/VKTexture.h
View File

@ -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

4
src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp
View File

@ -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

22
src/RenderDevice/Vulkan/VKImageView.cpp
View File

@ -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)
{