delete TGATexture

example/Vulkan/CMakeLists.txt

@@ -12,8 +12,8 @@ endmacro()
 CreateProject(00.triangle first_triangle.cpp)
 CreateProject(01.indices_rect indices_rect.cpp)
 CreateProject(02.1.texture_rect texture_rect.cpp)
-#CreateProject(02.2.texture_linear texture_linear.cpp TGATexture.cpp)
+#CreateProject(02.2.texture_linear texture_linear.cpp)
-CreateProject(03.HQFilterTexture HQFilterTexture.cpp TGATexture.cpp)
+CreateProject(03.HQFilterTexture HQFilterTexture.cpp)
 CreateProject(04.Geometry2D Geometry2D.cpp)
 CreateProject(05.Geometry3D Geometry3D.cpp)
 CreateProject(06.SceneTree SceneTree.cpp)

example/Vulkan/HQFilterTexture.cpp

@@ -10,7 +10,7 @@ using namespace hgl;
 using namespace hgl::graph;
 
 VK_NAMESPACE_BEGIN
-Texture2D *LoadTGATexture(const OSString &filename,Device *device,bool use_optimal=true);
+Texture2D *CreateTextureFromFile(Device *device,const OSString &filename,bool use_optimar=true);
 VK_NAMESPACE_END
 
 constexpr uint32_t SCREEN_WIDTH=512;
@@ -131,7 +131,7 @@ private:
 
     bool InitTexture()
     {
-        texture=vulkan::LoadTGATexture(OS_TEXT("res/image/noise32.tga"),device);
+        texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/noise32.Tex2D"));
         return texture;
     }
 

example/Vulkan/TGATexture.cpp

@@ -1,277 +0,0 @@
-#include<hgl/graph/vulkan/VK.h>
-#include<hgl/graph/vulkan/VKDevice.h>
-#include<hgl/graph/vulkan/VKBuffer.h>
-#include<hgl/io/FileInputStream.h>
-#include<hgl/log/LogInfo.h>
-
-VK_NAMESPACE_BEGIN
-namespace
-{
-    namespace tga
-    {
-        enum class ImageType:uint8
-        {
-            ColorMap=1,
-            TrueColor=2,
-            Grayscale=3
-        };
-
-        enum class VerticalDirection:uint
-        {
-            BottomToTop=0,
-            TopToBottom=1
-        };
-
-        #pragma pack(push,1)
-        struct Header
-        {
-            uint8 id;
-            uint8 color_map_type;
-            ImageType image_type;               // 1 colormap image ,2 true-color,3 grayscale
-
-            uint16 color_map_first;
-            uint16 color_map_length;
-            uint8 color_map_size;
-
-            uint16 x_origin;
-            uint16 y_origin;
-
-            uint16 width;
-            uint16 height;
-            uint8 bit;
-
-            uint8 image_desc;
-        };
-
-        union ImageDesc
-        {
-            //不要把此union放到上面的struct中，否则Visual C++会将此union编译成4字节。GCC无此问题
-            uint8 image_desc;
-            struct
-            {
-                uint alpha_depth:4;
-                uint horizontal_directon:1;     // 水平方向(不支持该参数)
-                VerticalDirection vertical_direction:1;      // 0 bottom to top,1 top to bottom
-            };
-        };
-        #pragma pack(pop)
-    }//namespace tga
-
-    void RGB8to565(uint16 *target,uint8 *src,uint size)
-    {
-        for(uint i=0;i<size;i++)
-        {
-            *target=((src[2]<<8)&0xF800)
-                   |((src[1]<<3)&0x7E0)
-                   | (src[0]>>3);
-
-            ++target;
-            src+=3;
-        }
-    }
-
-    template<typename T>
-    void RGB2RGBA(T *tar,T *src,uint size,const T alpha)
-    {
-        for(uint i=0;i<size;i++)
-        {
-            *tar++=*src++;
-            *tar++=*src++;
-            *tar++=*src++;
-            *tar++=alpha;
-        }
-    }
-
-    template<typename T>
-    void BGR2RGBASwap(T *tar,T *src,uint size,const T alpha)
-    {
-        for(uint i=0;i<size;i++)
-        {
-            *tar++=src[2];
-            *tar++=src[1];
-            *tar++=src[0];
-            *tar++=alpha;
-            src+=3;
-        }
-    }
-
-    template<typename T,typename S>
-    void BGR2FloatRGBASwap(T *tar,S *src,uint size,const T max_value,const T alpha)
-    {
-        for(uint i=0;i<size;i++)
-        {
-            *tar++=T(src[2])/max_value;
-            *tar++=T(src[1])/max_value;
-            *tar++=T(src[0])/max_value;
-            *tar++=alpha;
-            src+=3;
-        }
-    }
-
-    template<typename T,typename S>
-    void UInteger2Float(void *ptr,uint size,const T max_value)
-    {
-        T *tar=(T *)ptr;
-        S *src=(S *)ptr;
-
-        for(uint i=0;i<size;i++)
-            *tar++=T(*src++)/max_value;
-    }
-
-    void SwapRow(uint8 *data,uint line_size,uint height)
-    {
-        uint8 *top=data;
-        uint8 *bottom=data+(height-1)*line_size;
-        uint8 *tmp=new uint8[line_size];
-
-        while(top<bottom)
-        {
-            memcpy(tmp,bottom,line_size);
-            memcpy(bottom,top,line_size);
-            memcpy(top,tmp,line_size);
-
-            top+=line_size;
-            bottom-=line_size;
-        }
-
-        delete[] tmp;
-    }
-}//namespace
-
-Texture2D *LoadTGATexture(const OSString &filename,Device *device,bool use_optimar)
-{
-    io::OpenFileInputStream fis(filename);
-
-    if(!fis)
-    {
-        LOG_ERROR(OS_TEXT("[ERROR] open file<")+filename+OS_TEXT("> failed."));
-        return(nullptr);
-    }
-
-    const int64 file_length=fis->GetSize();
-
-    if(file_length<=sizeof(tga::Header))
-    {
-        LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length < sizeof(tga::Header)."));
-        return(nullptr);
-    }
-
-    tga::Header header;
-    tga::ImageDesc image_desc;
-
-    if(fis->Read(&header,sizeof(tga::Header))!=sizeof(tga::Header))
-        return(false);
-
-    const uint pixel_count  =header.width*header.height;        //象素数量
-    const uint pixel_byte   =header.bit>>3;                     //单个象素字节数
-    const uint line_bytes   =header.width*pixel_byte;           //每行字节数
-    const uint total_bytes  =header.height*line_bytes;          //总字节数
-
-    if(file_length<sizeof(tga::Header)+total_bytes)
-    {
-        LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length error."));
-        return(nullptr);
-    }
-
-    image_desc.image_desc=header.image_desc;
-
-    VkFormat format=FMT_UNDEFINED;
-
-    if(header.image_type==tga::ImageType::TrueColor)
-    {
-        if(header.bit==24)format=FMT_BGRA8UN;else
-        if(header.bit==32)format=FMT_BGRA8UN;else
-        if(header.bit==48)format=FMT_RGBA16UN;else
-        if(header.bit==64)format=FMT_RGBA16UN;
-    }
-    else
-    if(header.image_type==tga::ImageType::Grayscale)
-    {
-        if(header.bit== 8)format=FMT_R8UN;else
-        if(header.bit==16)format=FMT_R16UN;else
-        if(header.bit==32)format=FMT_R32F;
-    }
-
-    if(format==FMT_UNDEFINED)
-    {
-        LOG_ERROR(OS_TEXT("[ERROR] Image format error,filename: ")+filename);
-        return(nullptr);
-    }
-
-    vulkan::Buffer *buf;
-
-    if(header.image_type==tga::ImageType::TrueColor
-     &&(header.bit==24||header.bit==48||header.bit==72))
-    {
-        uint8 *pixel_data=new uint8[total_bytes];
-    
-        fis->Read(pixel_data,total_bytes);
-
-        if(image_desc.vertical_direction==tga::VerticalDirection::BottomToTop)
-            SwapRow((uint8 *)pixel_data,line_bytes,header.height);
-
-        const uint new_pixel_byte=((header.bit>>3)/3)*4;
-
-        buf=device->CreateBuffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT,pixel_count*new_pixel_byte);
-
-        if(new_pixel_byte==4)
-        {
-            RGB2RGBA<uint8>((uint8 *)buf->Map(),pixel_data,pixel_count,HGL_U8_MAX);
-            format=FMT_BGRA8UN;
-        }
-        else
-        if(new_pixel_byte==8)
-        {
-            BGR2RGBASwap<uint16>((uint16 *)buf->Map(),(uint16 *)pixel_data,pixel_count,HGL_U16_MAX);
-            format=FMT_RGBA16UN;
-        }
-        else 
-        if(new_pixel_byte==16)
-        {
-            BGR2FloatRGBASwap<float,uint32>((float *)buf->Map(),(uint32 *)pixel_data,pixel_count,(float)HGL_U32_MAX,1.0f);
-            format=FMT_RGBA32F;
-        }
-
-        buf->Unmap();
-    }
-    else
-    {
-        vulkan::Buffer *buf=device->CreateBuffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT,total_bytes);
-        
-        uint8 *pixel_data=(uint8 *)buf->Map();
-
-        fis->Read(pixel_data,total_bytes);
-
-        if(header.image_type==tga::ImageType::Grayscale&&header.bit==32)
-            UInteger2Float<float,uint32>(pixel_data,pixel_count,(float)HGL_U32_MAX);
-
-        if(image_desc.vertical_direction==tga::VerticalDirection::BottomToTop)
-            SwapRow((uint8 *)pixel_data,line_bytes,header.height);
-
-        buf->Unmap();
-    }
-
-    Texture2D *tex;
-    
-    if(use_optimar)
-    {   
-        tex=device->CreateTexture2D(format,buf,header.width,header.height);
-        delete buf;
-    }
-    else
-    {
-        //device->CreateTexture2DLinear(format,buf,header.width, header.height);
-    }
-
-    if(tex)
-    {
-        LOG_INFO(OS_TEXT("load image file<")+filename+OS_TEXT(">:<")+OSString(header.width)+OS_TEXT("x")+OSString(header.height)+OS_TEXT("> to texture ok"));
-    }
-    else
-    {
-        LOG_ERROR(OS_TEXT("load image file<")+filename+OS_TEXT(">:<")+OSString(header.width)+OS_TEXT("x")+OSString(header.height)+OS_TEXT("> to texture failed."));
-    }
-
-    return(tex);
-}
-VK_NAMESPACE_END

src/RenderDevice/Vulkan/POD/VKTextureLoader.cpp

@@ -154,6 +154,7 @@ Texture2D *CreateTextureFromFile(Device *device,const OSString &filename,bool us
 
         Texture2D *tex=device->CreateTexture2D(format,buf,file_header.width,file_header.height);
 
+        delete buf;
         return tex;
     }
     else