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

function renamed from CreateTextureFromFile to CreateTexture2DFromFile

Browse Source
This commit is contained in:
hyzboy
2021-12-14 15:34:21 +08:00
parent b2b625ef92
commit b95bc28f72
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SceneGraph/Vulkan/VKRenderResource.cpp
View File

@@ -129,7 +129,7 @@ Sampler *RenderResource::CreateSampler(Texture *tex)
return s;
}
Texture2D *CreateTextureFromFile(GPUDevice *device,const OSString &filename,bool auto_mipmaps);
Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename,bool auto_mipmaps);
Texture2D *RenderResource::LoadTexture2D(const OSString &filename,bool auto_mipmaps)
{
@@ -138,7 +138,7 @@ Texture2D *RenderResource::LoadTexture2D(const OSString &filename,bool auto_mipm
if(texture_by_name.Get(filename,(Texture *&)tex))
return tex;
tex=CreateTextureFromFile(device,filename,auto_mipmaps);
tex=CreateTexture2DFromFile(device,filename,auto_mipmaps);
if(tex)
{

2
src/SceneGraph/Vulkan/VKTextureLoader.cpp
View File

@@ -90,7 +90,7 @@ namespace
};//class VkTexture2DLoader
}//namespace
Texture2D *CreateTextureFromFile(GPUDevice *device,const OSString &filename,bool auto_mipmaps)
Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename,bool auto_mipmaps)
{
VkTexture2DLoader loader(device,auto_mipmaps);