Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-05 20:56:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ex versions of DDS load function to return original DDPIXELFORMAT metadata (#373)

Browse Source
This commit is contained in:
Chuck Walbourn
2023-07-10 13:23:13 -07:00
committed by GitHub
parent 83ea5ee1bc
commit 4d9d7a8ceb
3 changed files with 106 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
DirectXTex/DirectXTexDDS.cpp
View File

@@ -314,12 +314,17 @@ namespace
size_t size,
DDS_FLAGS flags,
_Out_ TexMetadata& metadata,
_Out_opt_ DDSMetaData* ddPixelFormat,
_Inout_ uint32_t& convFlags) noexcept
{
if (!pSource)
return E_INVALIDARG;
memset(&metadata, 0, sizeof(TexMetadata));
metadata = {};
if (ddPixelFormat)
{
*ddPixelFormat = {};
}
if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t)))
{
@@ -594,6 +599,19 @@ namespace
}
}
// Handle DDS-specific metadata
if (ddPixelFormat)
{
ddPixelFormat->size = pHeader->ddspf.size;
ddPixelFormat->flags = pHeader->ddspf.flags;
ddPixelFormat->fourCC = pHeader->ddspf.fourCC;
ddPixelFormat->RGBBitCount = pHeader->ddspf.RGBBitCount;
ddPixelFormat->RBitMask = pHeader->ddspf.RBitMask;
ddPixelFormat->GBitMask = pHeader->ddspf.GBitMask;
ddPixelFormat->BBitMask = pHeader->ddspf.BBitMask;
ddPixelFormat->ABitMask = pHeader->ddspf.ABitMask;
}
return S_OK;
}
}
@@ -1632,12 +1650,23 @@ HRESULT DirectX::GetMetadataFromDDSMemory(
size_t size,
DDS_FLAGS flags,
TexMetadata& metadata) noexcept
{
return GetMetadataFromDDSMemoryEx(pSource, size, flags, metadata, nullptr);
}
_Use_decl_annotations_
HRESULT DirectX::GetMetadataFromDDSMemoryEx(
const void* pSource,
size_t size,
DDS_FLAGS flags,
TexMetadata& metadata,
DDSMetaData* ddPixelFormat) noexcept
{
if (!pSource || size == 0)
return E_INVALIDARG;
uint32_t convFlags = 0;
return DecodeDDSHeader(pSource, size, flags, metadata, convFlags);
return DecodeDDSHeader(pSource, size, flags, metadata, ddPixelFormat, convFlags);
}
_Use_decl_annotations_
@@ -1645,6 +1674,16 @@ HRESULT DirectX::GetMetadataFromDDSFile(
const wchar_t* szFile,
DDS_FLAGS flags,
TexMetadata& metadata) noexcept
{
return GetMetadataFromDDSFileEx(szFile, flags, metadata, nullptr);
}
_Use_decl_annotations_
HRESULT DirectX::GetMetadataFromDDSFileEx(
const wchar_t* szFile,
DDS_FLAGS flags,
TexMetadata& metadata,
DDSMetaData* ddPixelFormat) noexcept
{
if (!szFile)
return E_INVALIDARG;
@@ -1720,7 +1759,7 @@ HRESULT DirectX::GetMetadataFromDDSFile(
#endif
uint32_t convFlags = 0;
return DecodeDDSHeader(header, headerLen, flags, metadata, convFlags);
return DecodeDDSHeader(header, headerLen, flags, metadata, ddPixelFormat, convFlags);
}
@@ -1734,6 +1773,18 @@ HRESULT DirectX::LoadFromDDSMemory(
DDS_FLAGS flags,
TexMetadata* metadata,
ScratchImage& image) noexcept
{
return LoadFromDDSMemoryEx(pSource, size, flags, metadata, nullptr, image);
}
_Use_decl_annotations_
HRESULT DirectX::LoadFromDDSMemoryEx(
const void* pSource,
size_t size,
DDS_FLAGS flags,
TexMetadata* metadata,
DDSMetaData* ddPixelFormat,
ScratchImage& image) noexcept
{
if (!pSource || size == 0)
return E_INVALIDARG;
@@ -1742,7 +1793,7 @@ HRESULT DirectX::LoadFromDDSMemory(
uint32_t convFlags = 0;
TexMetadata mdata;
HRESULT hr = DecodeDDSHeader(pSource, size, flags, mdata, convFlags);
HRESULT hr = DecodeDDSHeader(pSource, size, flags, mdata, ddPixelFormat, convFlags);
if (FAILED(hr))
return hr;
@@ -1806,6 +1857,17 @@ HRESULT DirectX::LoadFromDDSFile(
DDS_FLAGS flags,
TexMetadata* metadata,
ScratchImage& image) noexcept
{
return LoadFromDDSFileEx(szFile, flags, metadata, nullptr, image);
}
_Use_decl_annotations_
HRESULT DirectX::LoadFromDDSFileEx(
const wchar_t* szFile,
DDS_FLAGS flags,
TexMetadata* metadata,
DDSMetaData* ddPixelFormat,
ScratchImage& image) noexcept
{
if (!szFile)
return E_INVALIDARG;
@@ -1882,7 +1944,7 @@ HRESULT DirectX::LoadFromDDSFile(
uint32_t convFlags = 0;
TexMetadata mdata;
HRESULT hr = DecodeDDSHeader(header, headerLen, flags, mdata, convFlags);
HRESULT hr = DecodeDDSHeader(header, headerLen, flags, mdata, ddPixelFormat, convFlags);
if (FAILED(hr))
return hr;