kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added KRTexture::getFormat

Browse Source 
Child class implementations are WIP
This commit is contained in:
Kearwood Gilbert
2023-01-10 14:20:27 -08:00
parent 503bf73d65
commit ebe5682ed5
13 changed files with 144 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kraken/KRTexture.h
View File

@@ -84,6 +84,7 @@ public:
int getMinMipMap();
bool hasMipmaps();
virtual int getFaceCount() const = 0;
virtual VkFormat getFormat() const = 0;
kraken_stream_level getStreamLevel(KRTexture::texture_usage_t textureUsage);
float getLastFrameLodCoverage() const;

7
kraken/KRTextureAnimated.cpp
View File

@@ -156,4 +156,9 @@ void KRTextureAnimated::resize(int max_dim)
int KRTextureAnimated::getFaceCount() const
{
return 1;
}
}
VkFormat KRTextureAnimated::getFormat() const
{
return VK_FORMAT_UNDEFINED;
}

1
kraken/KRTextureAnimated.h
View File

@@ -51,6 +51,7 @@ public:
virtual bool isAnimated();
virtual void resize(int max_dim);
virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override;
private:
bool createGPUTexture(int lod_max_dim) override;

6
kraken/KRTextureCube.cpp
View File

@@ -172,3 +172,9 @@ int KRTextureCube::getFaceCount() const
{
return 6;
}
VkFormat KRTextureCube::getFormat() const
{
// TODO - Implement
return VK_FORMAT_UNDEFINED;
}

1
kraken/KRTextureCube.h
View File

@@ -47,6 +47,7 @@ public:
virtual long getMemRequiredForSize(int max_dim);
virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage);
virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override;
private:
bool createGPUTexture(int lod_max_dim) override;

94
kraken/KRTextureKTX.cpp
View File

@@ -134,6 +134,100 @@ int KRTextureKTX::getFaceCount() const
{
return m_header.numberOfFaces;
}
VkFormat KRTextureKTX::getFormat() const
{
/*
if (m_header.glFormat != 0) {
// Non-Compressed formats, from table 8.3 of OpenGL 4.4 spec:
switch (m_header.glFormat) {
case 0x1901: // GL_STENCIL_INDEX
case 0x1902: // GL_DEPTH_COMPONENT
case 0x84F9: // GL_DEPTH_STENCIL
case 0x1903: // GL_RED
case 0x1904: // GL_GREEN
case 0x1905: // GL_BLUE
case 0x8227: // GL_RG
case 0x1907: // GL_RGB
case 0x1908: // GL_RGBA
case 0x80E0: // GL_BGR
case 0x80E1: // GL_BGRA
case 0x8D94: // GL_RED_INTEGER
case 0x8D95: // GL_GREEN_INTEGER
case 0x8D96: // GL_BLUE_INTEGER
case 0x8228: // GL_RG_INTEGER
case 0x8D98: // GL_RGB_INTEGER
case 0x8D99: // GL_RGBA_INTEGER
case 0x8D9A: // GL_BGR_INTEGER
case 0x8D99: // GL_BGRA_INTEGER
default:
return VK_FORMAT_UNDEFINED;
}
}
*/
// Uncompressed formats
switch (m_header.glInternalFormat) {
// Sized internal color formats, from table 8.12 of OpenGL 4.4 spec
case 0x823A: // RG16UI RG ui16 ui16
case 0x823B: // RG32I RG i32 i32
case 0x823C: // RG32UI RG ui32 ui32
case 0x8D8F: // RGB8I RGB i8 i8 i8
case 0x8D7D: // RGB8UI RGB ui8 ui8 ui8
case 0x8D89: // RGB16I RGB i16 i16 i16
case 0x8D77: // RGB16UI RGB ui16 ui16 ui16
case 0x8D83: // RGB32I RGB i32 i32 i32
case 0x8D71: // RGB32UI RGB ui32 ui32 ui32
case 0x8D8E: // RGBA8I RGBA i8 i8 i8 i8
case 0x8D7C: // RGBA8UI RGBA ui8 ui8 ui8 ui8
case 0x8D88: // RGBA16I RGBA i16 i16 i16 i16
case 0x8D76: // RGBA16UI RGBA ui16 ui16 ui16 ui16
case 0x8D82: // RGBA32I RGBA i32 i32 i32 i32
case 0x8D70: // RGBA32UI RGBA ui32 ui32 ui32 ui32
// Sized internal depth and stencil formats, from table 8.13 of OpenGL 4.4 spec
case 0x81A5: // DEPTH_COMPONENT16 DEPTH_COMPONENT 16
case 0x81A6: // DEPTH_COMPONENT24 DEPTH_COMPONENT 24
case 0x81A7: // DEPTH_COMPONENT32 DEPTH_COMPONENT 32
case 0x8CAC: // DEPTH_COMPONENT32F DEPTH_COMPONENT f32
case 0x88F0: // DEPTH24_STENCIL8 DEPTH_STENCIL 24 ui8
case 0x8CAD: // DEPTH32F_STENCIL8 DEPTH_STENCIL f32 ui8
case 0x8D46: // STENCIL_INDEX1 STENCIL_INDEX ui1
case 0x8D47: // STENCIL_INDEX4 STENCIL_INDEX ui4
case 0x8D48: // STENCIL_INDEX8 STENCIL_INDEX ui8
case 0x8D49: // STENCIL_INDEX16 STENCIL_INDEX ui16
// Compressed formats, from table 8.14 of OpenGL 4.4 spec:
case 0x8225: // COMPRESSED_RED RED Generic unorm
case 0x8226: // COMPRESSED_RG RG Generic unorm
case 0x84ED: // COMPRESSED_RGB RGB Generic unorm
case 0x84EE: // COMPRESSED_RGBA RGBA Generic unorm
case 0x8C48: // COMPRESSED_SRGB RGB Generic unorm
case 0x8C49: // COMPRESSED_SRGB_ALPHA RGBA Generic unorm
case 0x8DBB: // COMPRESSED_RED_RGTC1 RED Specific unorm
case 0x8DBC: // COMPRESSED_SIGNED_RED_RGTC1 RED Specific snorm
case 0x8DBD: // COMPRESSED_RG_RGTC2 RG Specific unorm
case 0x8DBE: // COMPRESSED_SIGNED_RG_RGTC2 RG Specific snorm
case 0x8E8C: // COMPRESSED_RGBA_BPTC_UNORM RGBA Specific unorm
case 0x8E8D: // COMPRESSED_SRGB_ALPHA_BPTC_UNORM RGBA Specific unorm
case 0x8E8E: // COMPRESSED_RGB_BPTC_SIGNED_FLOAT RGB Specific float
case 0x8E8F: // COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT RGB Specific float
case 0x9274: // COMPRESSED_RGB8_ETC2 RGB Specific unorm
case 0x9275: // COMPRESSED_SRGB8_ETC2 RGB Specific unorm
case 0x9276: // COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 RGB Specific unorm
case 0x9277: // COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 RGB Specific unorm
case 0x9278: // COMPRESSED_RGBA8_ETC2_EAC RGBA Specific unorm
case 0x9279: // COMPRESSED_SRGB8_ALPHA8_ETC2_EAC RGBA Specific unorm
case 0x9270: // COMPRESSED_R11_EAC RED Specific unorm
case 0x9271: // COMPRESSED_SIGNED_R11_EAC RED Specific snorm
case 0x9272: // COMPRESSED_RG11_EAC RG Specific unorm
case 0x9273: // COMPRESSED_SIGNED_RG11_EAC RG Specific snorm
default:
return VK_FORMAT_UNDEFINED;
}
}
long KRTextureKTX::getMemRequiredForSize(int max_dim)
{
int target_dim = max_dim;

1
kraken/KRTextureKTX.h
View File

@@ -46,6 +46,7 @@ public:
virtual long getMemRequiredForSize(int max_dim);
virtual Vector2i getDimensions() const override;
virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override;
protected:

7
kraken/KRTextureKTX2.cpp
View File

@@ -184,3 +184,10 @@ int KRTextureKTX2::getFaceCount() const
{
return m_header.faceCount;
}
VkFormat KRTextureKTX2::getFormat() const
{
// TODO - Implement
return VK_FORMAT_UNDEFINED;
}

1
kraken/KRTextureKTX2.h
View File

@@ -45,6 +45,7 @@ public:
virtual long getMemRequiredForSize(int max_dim);
virtual Vector2i getDimensions() const override;
virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override;
protected:

18
kraken/KRTexturePVR.cpp
View File

@@ -151,6 +151,24 @@ Vector2i KRTexturePVR::getDimensions() const
return Vector2i::Create(m_iWidth, m_iHeight);
}
VkFormat KRTexturePVR::getFormat() const
{
PVRTexHeader header;
m_pData->copy(&header, 0, sizeof(PVRTexHeader));
uint32_t formatFlags = header.flags & PVR_TEXTURE_FLAG_TYPE_MASK;
switch (formatFlags) {
case kPVRTextureFlagTypePVRTC_2:
return VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG;
case kPVRTextureFlagTypePVRTC_4:
return VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG;
break;
default:
return VK_FORMAT_UNDEFINED;
break;
}
}
long KRTexturePVR::getMemRequiredForSize(int max_dim)
{
int target_dim = max_dim;

1
kraken/KRTexturePVR.h
View File

@@ -44,6 +44,7 @@ public:
virtual long getMemRequiredForSize(int max_dim);
virtual Vector2i getDimensions() const override;
virtual VkFormat getFormat() const override;
virtual int getFaceCount() const override;
protected:

6
kraken/KRTextureTGA.cpp
View File

@@ -409,6 +409,12 @@ Vector2i KRTextureTGA::getDimensions() const
return m_dimensions;
}
VkFormat KRTextureTGA::getFormat() const
{
// TODO - We should not automatically add the alpha channel on import
return VK_FORMAT_R8G8B8A8_SRGB;
}
std::string KRTextureTGA::getExtension()
{
return "tga";

1
kraken/KRTextureTGA.h
View File

@@ -48,6 +48,7 @@ public:
virtual long getMemRequiredForSize(int max_dim);
virtual Vector2i getDimensions() const override;
virtual VkFormat getFormat() const override;
virtual int getFaceCount() const override;
private:
long m_imageSize;