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); 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(1D,1D);
CREATE_IMAGE_VIEW(2D,2D); CREATE_IMAGE_VIEW(2D,2D);
CREATE_IMAGE_VIEW(3D,3D); CREATE_IMAGE_VIEW(3D,3D);

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

@ -157,7 +157,7 @@ Texture2D *CreateTextureFromFile(Device *device,const OSString &filename)
return tex; return tex;
} }
} }
/*
struct Texture2DData struct Texture2DData
{ {
uint32 width; uint32 width;
@ -219,5 +219,5 @@ void *LoadTextureFromFile(const OSString &filename)
delete buf; delete buf;
return tex; return tex;
} }
}*/ }
VK_NAMESPACE_END VK_NAMESPACE_END