Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add BC7_SRGB format support #287

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Add BC7_SRGB format support #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88fa8a4
Add BC7_SRGB format support
w23 Dec 21, 2023
b912125
Merge remote-tracking branch 'upstream/master' into bc7-srgb-merge
w23 Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion applications/_plugins/cimage/dds/dds_dx10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,14 @@ TC_PluginError LoadDDS_DX10(FILE* pFile, DDSD2* pDDSD, MipSet* pMipSet) {

case DXGI_FORMAT_BC7_TYPELESS:
case DXGI_FORMAT_BC7_UNORM:
case DXGI_FORMAT_BC7_UNORM_SRGB:
pMipSet->m_compressed = true;
pMipSet->m_format = CMP_FORMAT_BC7;
err = LoadDDS_DX10_FourCC(pFile, pDDSD, pMipSet, CMP_FOURCC_DX10);

case DXGI_FORMAT_BC7_UNORM_SRGB:
pMipSet->m_compressed = true;
pMipSet->m_format = CMP_FORMAT_BC7_SRGB;
err = LoadDDS_DX10_FourCC(pFile, pDDSD, pMipSet, CMP_FOURCC_DX10);
break;

// case DXGI_FORMAT_???:
Expand Down Expand Up @@ -371,6 +375,8 @@ DXGI_FORMAT GetDXGIFormat(const MipSet* pMipSet) {
return DXGI_FORMAT_BC5_UNORM;
case CMP_FORMAT_BC7:
return DXGI_FORMAT_BC7_UNORM;
case CMP_FORMAT_BC7_SRGB:
return DXGI_FORMAT_BC7_UNORM_SRGB;
// case CMP_FORMAT_ASTC: return DXGI_FORMAT_????; Not yet supported as of Jun 24 2015
}
} else
Expand Down Expand Up @@ -444,6 +450,7 @@ TC_PluginError SaveDDS_DX10(FILE* pFile, const MipSet* pMipSet) {
ddsd2.lPitch = ddsd2.dwWidth * 4;
break;
case CMP_FORMAT_BC7:
case CMP_FORMAT_BC7_SRGB:
default:
ddsd2.lPitch = ddsd2.dwWidth * 4;
break;
Expand Down
1 change: 1 addition & 0 deletions applications/_plugins/cimage/ktx/ktx1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,7 @@ int Plugin_KTX::TC_PluginFileSaveTexture(const char* pszFilename, MipSet* pMipSe
case CMP_FORMAT_BC6H:
case CMP_FORMAT_BC6H_SF:
case CMP_FORMAT_BC7 :
case CMP_FORMAT_BC7_SRGB :
case CMP_FORMAT_DXT1 :
case CMP_FORMAT_DXT3 :
case CMP_FORMAT_DXT5 :
Expand Down
7 changes: 7 additions & 0 deletions applications/_plugins/cimage/ktx2/ktx2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ int Plugin_KTX2::TC_PluginFileLoadTexture(const char* pszFilename, MipSet* pMipS
case VK_FORMAT_BC7_UNORM_BLOCK:
pMipSet->m_format = CMP_FORMAT_BC7;
break;
case VK_FORMAT_BC7_SRGB_BLOCK:
pMipSet->m_format = CMP_FORMAT_BC7_SRGB;
break;
case VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK:
pMipSet->m_format = CMP_FORMAT_ETC2_RGB; // Skip ETC as ETC2 is backward comp
break;
Expand Down Expand Up @@ -857,6 +860,10 @@ int Plugin_KTX2::TC_PluginFileSaveTexture(const char* pszFilename, MipSet* pMipS
// RGB_BP_UNorm;
textureCreateInfo.vkFormat = VK_FORMAT_BC7_UNORM_BLOCK;
break;
case CMP_FORMAT_BC7_SRGB:
// RGB_BP_UNorm;
textureCreateInfo.vkFormat = VK_FORMAT_BC7_SRGB_BLOCK;
break;
//case CMP_FORMAT_ATI1N:
// // COMPRESSED_FORMAT_ATI1N_UNorm_TMP;
// textureCreateInfo.vkFormat = VK_FORMAT_BC4_UNORM_BLOCK;
Expand Down
7 changes: 7 additions & 0 deletions applications/_plugins/common/atiformats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ CMP_FormatDesc g_FormatDesc[] = {
{CMP_FORMAT_BC6H, "BC6H"},
{CMP_FORMAT_BC6H_SF, "BC6H_SF" },
{CMP_FORMAT_BC7, "BC7"},
{CMP_FORMAT_BC7_SRGB, "BC7_SRGB"},


{CMP_FORMAT_DXT1, "DXT1"},
Expand Down Expand Up @@ -323,6 +324,9 @@ void CMP_API CMP_Format2FourCC(CMP_FORMAT format, MipSet *pMipSet) {
case CMP_FORMAT_BC7:
pMipSet->m_dwFourCC = CMP_FOURCC_DX10;
break;
case CMP_FORMAT_BC7_SRGB:
pMipSet->m_dwFourCC = CMP_FOURCC_DX10;
break;
#if (OPTION_BUILD_ASTC == 1)
case CMP_FORMAT_ASTC:
pMipSet->m_dwFourCC = CMP_FOURCC_DX10;
Expand Down Expand Up @@ -470,6 +474,7 @@ CMP_BOOL CMP_API CMP_IsCompressedFormat(CMP_FORMAT format) {
case CMP_FORMAT_BC6H:
case CMP_FORMAT_BC6H_SF:
case CMP_FORMAT_BC7:
case CMP_FORMAT_BC7_SRGB:
case CMP_FORMAT_DXT1:
case CMP_FORMAT_DXT3:
case CMP_FORMAT_DXT5:
Expand Down Expand Up @@ -609,6 +614,7 @@ CMP_BOOL CMP_API CMP_IsValidFormat(CMP_FORMAT InFormat)
case CMP_FORMAT_BC6H :
case CMP_FORMAT_BC6H_SF :
case CMP_FORMAT_BC7 :
case CMP_FORMAT_BC7_SRGB :
case CMP_FORMAT_ATI1N :
case CMP_FORMAT_ATI2N :
case CMP_FORMAT_ATI2N_XY :
Expand Down Expand Up @@ -765,6 +771,7 @@ static CMP_FORMAT GetFormat(CMP_DWORD dwFourCC) {
case CMP_FOURCC_BC5S: return CMP_FORMAT_BC5_S;
case CMP_FOURCC_BC6H: return CMP_FORMAT_BC6H;
case CMP_FOURCC_BC7: return CMP_FORMAT_BC7;
case CMP_FOURCC_BC7_SRGB: return CMP_FORMAT_BC7_SRGB;
#if (OPTION_BUILD_ASTC == 1)
case CMP_FOURCC_ASTC: return CMP_FORMAT_ASTC;
#endif
Expand Down
8 changes: 5 additions & 3 deletions applications/_plugins/common/cmdline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2076,6 +2076,7 @@ bool SVMInitCodec(KernelOptions* options)
case CMP_FORMAT_BC1:
case CMP_FORMAT_DXT1:
case CMP_FORMAT_BC7:
case CMP_FORMAT_BC7_SRGB:
#if (OPTION_BUILD_ASTC == 1)
case CMP_FORMAT_ASTC:
#endif
Expand Down Expand Up @@ -3089,7 +3090,7 @@ int ProcessCMDLine(CMP_Feedback_Proc pFeedbackProc, MipSet* p_userMipSetIn)
if ((g_CmdPrams.CompressOptions.fquality > 0.00f) && (g_CmdPrams.CompressOptions.fquality < 0.01f))
{
// set default max quality for fast processing codecs
if ((destFormat != CMP_FORMAT_BC7) && (destFormat != CMP_FORMAT_BC6H) && (destFormat != CMP_FORMAT_BC6H_SF))
if ((destFormat != CMP_FORMAT_BC7_SRGB) && (destFormat != CMP_FORMAT_BC7) && (destFormat != CMP_FORMAT_BC6H) && (destFormat != CMP_FORMAT_BC6H_SF))
{
g_CmdPrams.CompressOptions.fquality = 1.0f;
}
Expand Down Expand Up @@ -3282,12 +3283,13 @@ int ProcessCMDLine(CMP_Feedback_Proc pFeedbackProc, MipSet* p_userMipSetIn)
g_MipSetIn.m_format == CMP_FORMAT_BC3 || g_MipSetIn.m_format == CMP_FORMAT_BC4 ||
g_MipSetIn.m_format == CMP_FORMAT_BC4_S || g_MipSetIn.m_format == CMP_FORMAT_BC5 ||
g_MipSetIn.m_format == CMP_FORMAT_BC5_S || g_MipSetIn.m_format == CMP_FORMAT_BC6H ||
g_MipSetIn.m_format == CMP_FORMAT_BC6H_SF || g_MipSetIn.m_format == CMP_FORMAT_BC7;
g_MipSetIn.m_format == CMP_FORMAT_BC6H_SF || g_MipSetIn.m_format == CMP_FORMAT_BC7 ||
g_MipSetIn.m_format == CMP_FORMAT_BC7_SRGB;

bool DestFormatIsBCN = destFormat == CMP_FORMAT_BC1 || destFormat == CMP_FORMAT_BC2 || destFormat == CMP_FORMAT_BC3 ||
destFormat == CMP_FORMAT_BC4 || destFormat == CMP_FORMAT_BC4_S || destFormat == CMP_FORMAT_BC5 ||
destFormat == CMP_FORMAT_BC5_S || destFormat == CMP_FORMAT_BC6H || destFormat == CMP_FORMAT_BC6H_SF ||
destFormat == CMP_FORMAT_BC7;
destFormat == CMP_FORMAT_BC7 || destFormat == CMP_FORMAT_BC7_SRGB;

if (SourceFormatIsBCN && DestFormatIsBCN && (g_MipSetIn.m_format != destFormat))
{
Expand Down
1 change: 1 addition & 0 deletions applications/_plugins/common/texture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ extern "C" {

#define CMP_FOURCC_BC6H CMP_MAKEFOURCC('B', 'C', '6', 'H')
#define CMP_FOURCC_BC7 CMP_MAKEFOURCC('B', 'C', '7', 'x')
#define CMP_FOURCC_BC7_SRGB CMP_MAKEFOURCC('B', 'C', '7', 's')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a reasonable FourCC? Does it have to be congruent to a well-known value?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@w23 This seems reasonable, I am not aware of any other open source options that use it.

#if (OPTION_BUILD_ASTC == 1)
#define CMP_FOURCC_ASTC CMP_MAKEFOURCC('A', 'S', 'T', 'C')
#endif
Expand Down
1 change: 1 addition & 0 deletions applications/_plugins/common/textureio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ int AMDSaveMIPSTextureImage(const char *DestFile, MipSet *MipSetIn, bool use_OCV
case CMP_FORMAT_ASTC:
#endif
case CMP_FORMAT_BC7:
case CMP_FORMAT_BC7_SRGB:
case CMP_FORMAT_BC6H:
case CMP_FORMAT_BC6H_SF:
case CMP_FORMAT_ETC_RGB:
Expand Down
2 changes: 1 addition & 1 deletion cmp_compressonatorlib/bc7/codec_bc7.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ unsigned int BC7ThreadProcEncode(void* param) {
// Construction/Destruction
//////////////////////////////////////////////////////////////////////////////

CCodec_BC7::CCodec_BC7() : CCodec_DXTC(CT_BC7) {
CCodec_BC7::CCodec_BC7(CodecType codecType) : CCodec_DXTC(codecType) {
m_LibraryInitialized = false;

m_Use_MultiThreading = true;
Expand Down
2 changes: 1 addition & 1 deletion cmp_compressonatorlib/bc7/codec_bc7.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ struct BC7EncodeThreadParam {

class CCodec_BC7 : public CCodec_DXTC {
public:
CCodec_BC7();
CCodec_BC7(CodecType codecType);
~CCodec_BC7();

virtual bool SetParameter(const CMP_CHAR* pszParamName, CMP_CHAR* sValue);
Expand Down
1 change: 1 addition & 0 deletions cmp_compressonatorlib/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ typedef enum _CodecType
CT_BC6H,
CT_BC6H_SF,
CT_BC7,
CT_BC7_SRGB,
#if (OPTION_BUILD_ASTC == 1)
CT_ASTC,
#endif
Expand Down
4 changes: 3 additions & 1 deletion cmp_compressonatorlib/common/codec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ CCodec* CreateCodec(CodecType nCodecType) {
case CT_BC6H_SF:
return new CCodec_BC6H(nCodecType);
case CT_BC7:
return new CCodec_BC7;
case CT_BC7_SRGB:
return new CCodec_BC7(nCodecType);
#if (OPTION_BUILD_ASTC == 1)
case CT_ASTC:
return new CCodec_ASTC;
Expand Down Expand Up @@ -320,6 +321,7 @@ CMP_DWORD CalcBufferSize(CodecType nCodecType, CMP_DWORD dwWidth, CMP_DWORD dwHe

// Block size is 4x4 and 128 bits per block
case CT_BC7:
case CT_BC7_SRGB:
dwWidth = ((dwWidth + 3) / 4) * 4;
dwHeight = ((dwHeight + 3) / 4) * 4;
buffsize = dwWidth * dwHeight;
Expand Down
4 changes: 4 additions & 0 deletions cmp_compressonatorlib/compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ CodecType GetCodecType(CMP_FORMAT format) {
return CT_BC6H_SF;
case CMP_FORMAT_BC7:
return CT_BC7;
case CMP_FORMAT_BC7_SRGB:
return CT_BC7_SRGB;
#if (OPTION_BUILD_ASTC == 1)
case CMP_FORMAT_ASTC:
return CT_ASTC;
Expand Down Expand Up @@ -326,6 +328,7 @@ CMP_ERROR CompressTexture(const CMP_Texture* pSourceTexture, CMP_Texture* pDestT

switch(destType) {
case CT_BC7:
case CT_BC7_SRGB:
pCodec->SetParameter("MultiThreading", (CMP_DWORD) !pOptions->bDisableMultiThreading);

if (!pOptions->bDisableMultiThreading)
Expand Down Expand Up @@ -477,6 +480,7 @@ void ThreadedCompressProc(void *lpParameter) {
CMP_ERROR ThreadedCompressTexture(const CMP_Texture* pSourceTexture, CMP_Texture* pDestTexture, const CMP_CompressOptions* pOptions, CMP_Feedback_Proc pFeedbackProc, CodecType destType) {
// Note function should not be called for the following Codecs....
if (destType == CT_BC7) return CMP_ABORTED;
if (destType == CT_BC7_SRGB) return CMP_ABORTED;
#ifdef USE_APC
if (destType == CT_APC)
return CMP_ABORTED;
Expand Down
1 change: 1 addition & 0 deletions cmp_compressonatorlib/compressonator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ CMP_ERROR CMP_API CMP_ConvertTexture(CMP_Texture* pSourceTexture,
(destType != CT_ASTC) &&
#endif
(destType != CT_BC7) &&
(destType != CT_BC7_SRGB) &&
(destType != CT_BC6H) && (destType != CT_BC6H_SF)
#ifdef USE_APC
&& (destType != CT_APC)
Expand Down
1 change: 1 addition & 0 deletions cmp_compressonatorlib/compressonator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ typedef enum {
CMP_FORMAT_BC6H = 0x0061, // DXGI_FORMAT_BC6H_UF16 VK_FORMAT_BC6H_UFLOAT_BLOCK GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT BC6H compressed texture format (UF)
CMP_FORMAT_BC6H_SF = 0x1061, // DXGI_FORMAT_BC6H_SF16 VK_FORMAT_BC6H_SFLOAT_BLOCK GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT BC6H compressed texture format (SF)
CMP_FORMAT_BC7 = 0x0071, // DXGI_FORMAT_BC7_UNORM VK_FORMAT_BC7_UNORM_BLOCK GL_COMPRESSED_RGBA_BPTC_UNORM BC7 compressed texture format
CMP_FORMAT_BC7_SRGB = 0x0072, // DXGI_FORMAT_BC7_UNORM_SRGB VK_FORMAT_BC7_SRGB_BLOCK GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM BC7 compressed texture format

CMP_FORMAT_ATI1N = 0x0141, // DXGI_FORMAT_BC4_UNORM VK_FORMAT_BC4_UNORM_BLOCK GL_COMPRESSED_RED_RGTC1 Single component compression format using the same technique as DXT5 alpha. Four bits per pixel.
CMP_FORMAT_ATI2N = 0x0151, // DXGI_FORMAT_BC5_UNORM VK_FORMAT_BC5_UNORM_BLOCK GL_COMPRESSED_RG_RGTC2 Two component compression format using the same technique as DXT5 alpha. Designed for compression of tangent space normal maps. Eight bits per pixel.
Expand Down
3 changes: 3 additions & 0 deletions cmp_framework/compute_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,8 @@ CodecType GetCodecType2(CMP_FORMAT format) {
return CT_BC6H_SF;
case CMP_FORMAT_BC7:
return CT_BC7;
case CMP_FORMAT_BC7_SRGB:
return CT_BC7_SRGB;
#if (OPTION_BUILD_ASTC == 1)
case CMP_FORMAT_ASTC:
return CT_ASTC;
Expand Down Expand Up @@ -567,6 +569,7 @@ CMP_DWORD CalcBufferSizeCT(CodecType nCodecType, CMP_DWORD dwWidth, CMP_DWORD dw

// Block size is 4x4 and 128 bits per block
case CT_BC7:
case CT_BC7_SRGB:
dwWidth = ((dwWidth + 3) / 4) * 4;
dwHeight = ((dwHeight + 3) / 4) * 4;
buffsize = dwWidth * dwHeight;
Expand Down