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

TGA加载增加枚举明确属性意义，清除直接手写的ID

Browse Source
This commit is contained in:
hyzboy 2019-09-02 17:15:52 +08:00
parent f611b8bfd9
commit 66fee61451
4 changed files with 109 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit e4f3f4fac3951822fcc93258e729bd00c7851082 Subproject commit 64dfbbcf7b748ad6b2c29ba1a4e0841f56201436

2
CMPlatform

@ -1 +1 @@
Subproject commit 89aba9674ba6f70f5060dbdf28316e9f1f072cd4 Subproject commit 86e9b1533f66f3b3b5034a12506467ebd17ab739

52
example/Vulkan/TGATexture.cpp
View File

@ -7,12 +7,27 @@
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
namespace 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) #pragma pack(push,1)
struct TGAHeader struct Header
{ {
uint8 id; uint8 id;
uint8 color_map_type; uint8 color_map_type;
uint8 image_type; // 1 colormap image ,2 true-color,3 grayscale ImageType image_type; // 1 colormap image ,2 true-color,3 grayscale
uint16 color_map_first; uint16 color_map_first;
uint16 color_map_length; uint16 color_map_length;
@ -28,18 +43,19 @@ namespace
uint8 image_desc; uint8 image_desc;
}; };
union TGAImageDesc union ImageDesc
{ {
//不要把此union放到上面的struct中，否则Visual C++会将此union编译成4字节。GCC无此问题 //不要把此union放到上面的struct中，否则Visual C++会将此union编译成4字节。GCC无此问题
uint8 image_desc; uint8 image_desc;
struct struct
{ {
uint alpha_depth:4; uint alpha_depth:4;
uint reserved:1; uint horizontal_directon:1; // 水平方向(不支持该参数)
uint direction:1; //0 lower-left,1 upper left VerticalDirection vertical_direction:1; // 0 bottom to top,1 top to bottom
}; };
}; };
#pragma pack(pop) #pragma pack(pop)
}//namespace tga
void RGB8to565(uint16 *target,uint8 *src,uint size) void RGB8to565(uint16 *target,uint8 *src,uint size)
{ {
@ -97,21 +113,21 @@ Texture2D *LoadTGATexture(const OSString &filename,Device *device)
const int64 file_length=fis->GetSize(); const int64 file_length=fis->GetSize();
if(file_length<=sizeof(TGAHeader)) if(file_length<=sizeof(tga::Header))
{ {
LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length < sizeof(TGAHeader).")); LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length < sizeof(tga::Header)."));
return(nullptr); return(nullptr);
} }
TGAHeader header; tga::Header header;
TGAImageDesc image_desc; tga::ImageDesc image_desc;
if(fis->Read(&header,sizeof(TGAHeader))!=sizeof(TGAHeader)) if(fis->Read(&header,sizeof(tga::Header))!=sizeof(tga::Header))
return(false); return(false);
const uint total_bytes=header.width*header.height*header.bit>>3; const uint total_bytes=header.width*header.height*header.bit>>3;
if(file_length<sizeof(TGAHeader)+total_bytes) if(file_length<sizeof(tga::Header)+total_bytes)
{ {
LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length error.")); LOG_ERROR(OS_TEXT("[ERROR] file<")+filename+OS_TEXT("> length error."));
return(nullptr); return(nullptr);
@ -121,13 +137,17 @@ Texture2D *LoadTGATexture(const OSString &filename,Device *device)
VkFormat format=FMT_UNDEFINED; VkFormat format=FMT_UNDEFINED;
if(header.image_type==2) if(header.image_type==tga::ImageType::TrueColor)
{ {
if(header.bit==24)format=FMT_BGRA8UN;else if(header.bit==24)format=FMT_BGRA8UN;else
if(header.bit==32)format=FMT_BGRA8UN; if(header.bit==32)format=FMT_BGRA8UN;
} }
else if(header.image_type==3&&header.bit==8) else
format=FMT_R8UN; if(header.image_type==tga::ImageType::Grayscale)
{
if(header.bit== 8)format=FMT_R8UN;else
if(header.bit==16)format=FMT_R16UN;
}
if(format==FMT_UNDEFINED) if(format==FMT_UNDEFINED)
{ {
@ -143,7 +163,7 @@ Texture2D *LoadTGATexture(const OSString &filename,Device *device)
fis->Read(pixel_data,total_bytes); fis->Read(pixel_data,total_bytes);
if(image_desc.direction==0) if(image_desc.vertical_direction==tga::VerticalDirection::BottomToTop)
SwapRow((uint8 *)pixel_data,header.width*header.bit/8,header.height); SwapRow((uint8 *)pixel_data,header.width*header.bit/8,header.height);
buf=device->CreateBuffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT,header.width*header.height*4); buf=device->CreateBuffer(VK_BUFFER_USAGE_TRANSFER_SRC_BIT,header.width*header.height*4);
@ -160,7 +180,7 @@ Texture2D *LoadTGATexture(const OSString &filename,Device *device)
fis->Read(pixel_data,total_bytes); fis->Read(pixel_data,total_bytes);
if(image_desc.direction==0) if(image_desc.vertical_direction==tga::VerticalDirection::BottomToTop)
SwapRow((uint8 *)pixel_data,header.width*header.bit/8,header.height); SwapRow((uint8 *)pixel_data,header.width*header.bit/8,header.height);
buf->Unmap(); buf->Unmap();

44
inc/hgl/graph/vulkan/VKFormat.h
View File

@ -33,23 +33,21 @@ VK_NAMESPACE_BEGIN
#define FMT_RG8I VK_FORMAT_R8G8_SINT #define FMT_RG8I VK_FORMAT_R8G8_SINT
#define FMT_RG8s VK_FORMAT_R8G8_SRGB #define FMT_RG8s VK_FORMAT_R8G8_SRGB
//注：几乎任何GPU都不支持 RGB8,BGR8,RGB16 这三类格式，所以尽可能不要使用这三类格式 #define FMT_RGB8UN VK_FORMAT_R8G8B8_UNORM /* no GPU support,don't use */
#define FMT_RGB8SN VK_FORMAT_R8G8B8_SNORM /* no GPU support,don't use */
#define FMT_RGB8US VK_FORMAT_R8G8B8_USCALED /* no GPU support,don't use */
#define FMT_RGB8SS VK_FORMAT_R8G8B8_SSCALED /* no GPU support,don't use */
#define FMT_RGB8U VK_FORMAT_R8G8B8_UINT /* no GPU support,don't use */
#define FMT_RGB8I VK_FORMAT_R8G8B8_SINT /* no GPU support,don't use */
#define FMT_RGB8s VK_FORMAT_R8G8B8_SRGB /* no GPU support,don't use */
#define FMT_RGB8UN VK_FORMAT_R8G8B8_UNORM #define FMT_BGR8UN VK_FORMAT_B8G8R8_UNORM /* no GPU support,don't use */
#define FMT_RGB8SN VK_FORMAT_R8G8B8_SNORM #define FMT_BGR8SN VK_FORMAT_B8G8R8_SNORM /* no GPU support,don't use */
#define FMT_RGB8US VK_FORMAT_R8G8B8_USCALED #define FMT_BGR8US VK_FORMAT_B8G8R8_USCALED /* no GPU support,don't use */
#define FMT_RGB8SS VK_FORMAT_R8G8B8_SSCALED #define FMT_BGR8SS VK_FORMAT_B8G8R8_SSCALED /* no GPU support,don't use */
#define FMT_RGB8U VK_FORMAT_R8G8B8_UINT #define FMT_BGR8U VK_FORMAT_B8G8R8_UINT /* no GPU support,don't use */
#define FMT_RGB8I VK_FORMAT_R8G8B8_SINT #define FMT_BGR8I VK_FORMAT_B8G8R8_SINT /* no GPU support,don't use */
#define FMT_RGB8s VK_FORMAT_R8G8B8_SRGB #define FMT_BGR8s VK_FORMAT_B8G8R8_SRGB /* no GPU support,don't use */
#define FMT_BGR8UN VK_FORMAT_B8G8R8_UNORM
#define FMT_BGR8SN VK_FORMAT_B8G8R8_SNORM
#define FMT_BGR8US VK_FORMAT_B8G8R8_USCALED
#define FMT_BGR8SS VK_FORMAT_B8G8R8_SSCALED
#define FMT_BGR8U VK_FORMAT_B8G8R8_UINT
#define FMT_BGR8I VK_FORMAT_B8G8R8_SINT
#define FMT_BGR8s VK_FORMAT_B8G8R8_SRGB
#define FMT_RGBA8UN VK_FORMAT_R8G8B8A8_UNORM #define FMT_RGBA8UN VK_FORMAT_R8G8B8A8_UNORM
#define FMT_RGBA8SN VK_FORMAT_R8G8B8A8_SNORM #define FMT_RGBA8SN VK_FORMAT_R8G8B8A8_SNORM
@ -105,13 +103,13 @@ VK_NAMESPACE_BEGIN
#define FMT_RG16I VK_FORMAT_R16G16_SINT #define FMT_RG16I VK_FORMAT_R16G16_SINT
#define FMT_RG16F VK_FORMAT_R16G16_SFLOAT #define FMT_RG16F VK_FORMAT_R16G16_SFLOAT
#define FMT_RGB16UN VK_FORMAT_R16G16B16_UNORM #define FMT_RGB16UN VK_FORMAT_R16G16B16_UNORM /* no GPU support,don't use */
#define FMT_RGB16SN VK_FORMAT_R16G16B16_SNORM #define FMT_RGB16SN VK_FORMAT_R16G16B16_SNORM /* no GPU support,don't use */
#define FMT_RGB16US VK_FORMAT_R16G16B16_USCALED #define FMT_RGB16US VK_FORMAT_R16G16B16_USCALED /* no GPU support,don't use */
#define FMT_RGB16SS VK_FORMAT_R16G16B16_SSCALED #define FMT_RGB16SS VK_FORMAT_R16G16B16_SSCALED /* no GPU support,don't use */
#define FMT_RGB16U VK_FORMAT_R16G16B16_UINT #define FMT_RGB16U VK_FORMAT_R16G16B16_UINT /* no GPU support,don't use */
#define FMT_RGB16I VK_FORMAT_R16G16B16_SINT #define FMT_RGB16I VK_FORMAT_R16G16B16_SINT /* no GPU support,don't use */
#define FMT_RGB16F VK_FORMAT_R16G16B16_SFLOAT #define FMT_RGB16F VK_FORMAT_R16G16B16_SFLOAT /* no GPU support,don't use */
#define FMT_RGBA16UN VK_FORMAT_R16G16B16A16_UNORM #define FMT_RGBA16UN VK_FORMAT_R16G16B16A16_UNORM
#define FMT_RGBA16SN VK_FORMAT_R16G16B16A16_SNORM #define FMT_RGBA16SN VK_FORMAT_R16G16B16A16_SNORM