From b95bc28f724107f0f7eea26b36110869ffadc892 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 14 Dec 2021 15:34:21 +0800 Subject: [PATCH] function renamed from CreateTextureFromFile to CreateTexture2DFromFile --- example/Vulkan/DeferredRenderMultiCmdBuffer.cpp | 2 +- example/Vulkan/RectanglePrimitive.cpp | 2 +- example/Vulkan/texture_rect.cpp | 2 +- src/SceneGraph/Vulkan/VKRenderResource.cpp | 4 ++-- src/SceneGraph/Vulkan/VKTextureLoader.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/Vulkan/DeferredRenderMultiCmdBuffer.cpp b/example/Vulkan/DeferredRenderMultiCmdBuffer.cpp index 2bf9596b..9bafa3bb 100644 --- a/example/Vulkan/DeferredRenderMultiCmdBuffer.cpp +++ b/example/Vulkan/DeferredRenderMultiCmdBuffer.cpp @@ -16,7 +16,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTextureFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=1280; diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 1f66cb5f..388ccd2e 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -10,7 +10,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTextureFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_SIZE=512; diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 7e4d8b0a..b532ff72 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -11,7 +11,7 @@ using namespace hgl; using namespace hgl::graph; VK_NAMESPACE_BEGIN -Texture2D *CreateTextureFromFile(GPUDevice *device,const OSString &filename); +Texture2D *CreateTexture2DFromFile(GPUDevice *device,const OSString &filename); VK_NAMESPACE_END constexpr uint32_t SCREEN_WIDTH=256; diff --git a/src/SceneGraph/Vulkan/VKRenderResource.cpp b/src/SceneGraph/Vulkan/VKRenderResource.cpp index 37913a83..c3da262b 100644 --- a/src/SceneGraph/Vulkan/VKRenderResource.cpp +++ b/src/SceneGraph/Vulkan/VKRenderResource.cpp @@ -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) { diff --git a/src/SceneGraph/Vulkan/VKTextureLoader.cpp b/src/SceneGraph/Vulkan/VKTextureLoader.cpp index 41c60749..27dda4b7 100644 --- a/src/SceneGraph/Vulkan/VKTextureLoader.cpp +++ b/src/SceneGraph/Vulkan/VKTextureLoader.cpp @@ -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);