Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 15:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

texconv: added optional .exr support

Browse Source
This commit is contained in:
Chuck Walbourn 2016-10-02 01:53:31 -07:00
parent 2065926419
commit bff5db3f6d
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Texconv/texconv.cpp
View File

@ -37,6 +37,14 @@
#include "DirectXPackedVector.h" #include "DirectXPackedVector.h"
//Uncomment to add support for OpenEXR (.exr)
//#define USE_OPENEXR
#ifdef USE_OPENEXR
// See <https://github.com/Microsoft/DirectXTex/wiki/Adding-OpenEXR> for details
#include "DirectXTexEXR.h"
#endif
using namespace DirectX; using namespace DirectX;
using namespace DirectX::PackedVector; using namespace DirectX::PackedVector;
using Microsoft::WRL::ComPtr; using Microsoft::WRL::ComPtr;
@ -328,6 +336,7 @@ const SValue g_pFilters[] =
#define CODEC_HDP 0xFFFF0003 #define CODEC_HDP 0xFFFF0003
#define CODEC_JXR 0xFFFF0004 #define CODEC_JXR 0xFFFF0004
#define CODEC_HDR 0xFFFF0005 #define CODEC_HDR 0xFFFF0005
#define CODEC_EXR 0xFFFF0006
const SValue g_pSaveFileTypes[] = // valid formats to write to const SValue g_pSaveFileTypes[] = // valid formats to write to
{ {
@ -343,6 +352,9 @@ const SValue g_pSaveFileTypes[] = // valid formats to write to
{ L"WDP", WIC_CODEC_WMP }, { L"WDP", WIC_CODEC_WMP },
{ L"HDP", CODEC_HDP }, { L"HDP", CODEC_HDP },
{ L"JXR", CODEC_JXR }, { L"JXR", CODEC_JXR },
#ifdef USE_OPENEXR
{ L"EXR", CODEC_EXR },
#endif
{ nullptr, CODEC_DDS } { nullptr, CODEC_DDS }
}; };
@ -1420,6 +1432,17 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
continue; continue;
} }
} }
#ifdef USE_OPENEXR
else if (_wcsicmp(ext, L".exr") == 0)
{
hr = LoadFromEXRFile(pConv->szSrc, &info, *image);
if (FAILED(hr))
{
wprintf(L" FAILED (%x)\n", hr);
continue;
}
}
#endif
else else
{ {
// WIC shares the same filter values for mode and dither // WIC shares the same filter values for mode and dither
@ -2292,6 +2315,12 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
hr = SaveToHDRFile(img[0], pConv->szDest); hr = SaveToHDRFile(img[0], pConv->szDest);
break; break;
#ifdef USE_OPENEXR
case CODEC_EXR:
hr = SaveToEXRFile(img[0], pConv->szDest);
break;
#endif
default: default:
{ {
WICCodecs codec = (FileType == CODEC_HDP || FileType == CODEC_JXR) ? WIC_CODEC_WMP : static_cast<WICCodecs>(FileType); WICCodecs codec = (FileType == CODEC_HDP || FileType == CODEC_JXR) ? WIC_CODEC_WMP : static_cast<WICCodecs>(FileType);