Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 04:16:12 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Avoid static initialization order fiasco (#196)

Browse Source
This commit is contained in:
Chuck Walbourn
2020-09-18 14:06:27 -07:00
parent 01823b7830
commit 216e2b0388
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WICTextureLoader/WICTextureLoader11.cpp
View File

@@ -63,11 +63,11 @@ namespace
//-------------------------------------------------------------------------------------
struct WICTranslate
{
GUID wic;
const GUID& wic;
DXGI_FORMAT format;
};
const WICTranslate g_WICFormats[] =
constexpr WICTranslate g_WICFormats[] =
{
{ GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT },
@@ -98,11 +98,11 @@ namespace
struct WICConvert
{
GUID source;
GUID target;
const GUID& source;
const GUID& target;
};
const WICConvert g_WICConvert[] =
constexpr WICConvert g_WICConvert[] =
{
// Note target GUID in this conversion table must be one of those directly supported formats (above).

10
WICTextureLoader/WICTextureLoader12.cpp
View File

@@ -50,11 +50,11 @@ namespace
//-------------------------------------------------------------------------------------
struct WICTranslate
{
GUID wic;
const GUID& wic;
DXGI_FORMAT format;
};
const WICTranslate g_WICFormats[] =
constexpr WICTranslate g_WICFormats[] =
{
{ GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT },
@@ -87,11 +87,11 @@ namespace
struct WICConvert
{
GUID source;
GUID target;
const GUID& source;
const GUID& target;
};
const WICConvert g_WICConvert[] =
constexpr WICConvert g_WICConvert[] =
{
// Note target GUID in this conversion table must be one of those directly supported formats (above).

10
WICTextureLoader/WICTextureLoader9.cpp
View File

@@ -47,11 +47,11 @@ namespace
//-------------------------------------------------------------------------------------
struct WICTranslate
{
GUID wic;
const GUID& wic;
D3DFORMAT format;
};
const WICTranslate g_WICFormats[] =
constexpr WICTranslate g_WICFormats[] =
{
{ GUID_WICPixelFormat128bppRGBAFloat, D3DFMT_A32B32G32R32F },
@@ -80,11 +80,11 @@ namespace
struct WICConvert
{
GUID source;
GUID target;
const GUID& source;
const GUID& target;
};
const WICConvert g_WICConvert[] =
constexpr WICConvert g_WICConvert[] =
{
// Note target GUID in this conversion table must be one of those directly supported formats (above).