Skip to content

A
angle
Commit 81820494 by Jamie Madill
Options

Don't use static const & locals for format tables.

This hits an unimplemented feature in Clang. Work around this by using values instead of references. BUG=angleproject:1160 Change-Id: I94b08d8fd9a09bbbfbe4bcd1b6f9d7f0031ce18d Reviewed-on: https://chromium-review.googlesource.com/308910Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent bc781f31
Showing with 101 additions and 101 deletions
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
......@@ -261,7 +261,7 @@ def get_texture_format_item(idx, texture_format):
else:
table_data += ' else if (' + texture_format["requirementsFcn"] + '(renderer11DeviceCaps))\n'
table_data += ' {\n'
table_data += ' static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += ' static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += ' ' + texture_format[tex_format] + ',\n'
table_data += ' ' + texture_format[srv_format] + ',\n'
table_data += ' ' + texture_format[rtv_format] + ',\n'
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
......@@ -225,7 +225,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_A8_UNORM,
DXGI_FORMAT_A8_UNORM,
DXGI_FORMAT_A8_UNORM,
......@@ -234,7 +234,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -250,7 +250,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -266,7 +266,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -282,7 +282,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_A8_UNORM,
DXGI_FORMAT_A8_UNORM,
DXGI_FORMAT_A8_UNORM,
......@@ -291,7 +291,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -307,7 +307,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -323,7 +323,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -339,7 +339,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -355,7 +355,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -371,7 +371,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -387,7 +387,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -403,7 +403,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -419,7 +419,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -435,7 +435,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -451,7 +451,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -467,7 +467,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC2_UNORM,
DXGI_FORMAT_BC2_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -483,7 +483,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC3_UNORM,
DXGI_FORMAT_BC3_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -499,7 +499,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -515,7 +515,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -531,7 +531,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -547,7 +547,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN,
......@@ -563,7 +563,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN,
......@@ -579,7 +579,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN,
......@@ -595,7 +595,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_UNKNOWN,
......@@ -604,7 +604,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -620,7 +620,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G8X24_TYPELESS,
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
DXGI_FORMAT_UNKNOWN,
......@@ -629,7 +629,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -645,7 +645,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_TYPELESS,
DXGI_FORMAT_R16_UNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -654,7 +654,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D16_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -670,7 +670,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_UNKNOWN,
......@@ -679,7 +679,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -695,7 +695,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_TYPELESS,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_UNKNOWN,
......@@ -704,7 +704,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -720,7 +720,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_UNKNOWN,
......@@ -736,7 +736,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -752,7 +752,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -768,7 +768,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -784,7 +784,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -800,7 +800,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -816,7 +816,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -832,7 +832,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -848,7 +848,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -864,7 +864,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -880,7 +880,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R11G11B10_FLOAT,
......@@ -896,7 +896,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R16_FLOAT,
......@@ -912,7 +912,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R16_SINT,
......@@ -928,7 +928,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_UINT,
......@@ -944,7 +944,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_FLOAT,
......@@ -960,7 +960,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R32_SINT,
......@@ -976,7 +976,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_UINT,
......@@ -992,7 +992,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM,
......@@ -1008,7 +1008,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_R8_SINT,
......@@ -1024,7 +1024,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_UINT,
......@@ -1040,7 +1040,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -1056,7 +1056,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_FLOAT,
......@@ -1072,7 +1072,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R16G16_SINT,
......@@ -1088,7 +1088,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_UINT,
......@@ -1104,7 +1104,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_FLOAT,
......@@ -1120,7 +1120,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G32_SINT,
......@@ -1136,7 +1136,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_UINT,
......@@ -1152,7 +1152,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM,
......@@ -1168,7 +1168,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R8G8_SINT,
......@@ -1184,7 +1184,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_UINT,
......@@ -1200,7 +1200,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -1216,7 +1216,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1232,7 +1232,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UNORM,
......@@ -1248,7 +1248,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R10G10B10A2_UINT,
......@@ -1264,7 +1264,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -1280,7 +1280,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
......@@ -1296,7 +1296,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
......@@ -1312,7 +1312,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -1328,7 +1328,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
......@@ -1344,7 +1344,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
......@@ -1360,7 +1360,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (SupportsFormat<DXGI_FORMAT_B5G6R5_UNORM,false>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1369,7 +1369,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (SupportsFormat<DXGI_FORMAT_B5G6R5_UNORM,true>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B5G6R5_UNORM,
DXGI_FORMAT_B5G6R5_UNORM,
DXGI_FORMAT_B5G6R5_UNORM,
......@@ -1385,7 +1385,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (SupportsFormat<DXGI_FORMAT_B5G5R5A1_UNORM,false>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1394,7 +1394,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (SupportsFormat<DXGI_FORMAT_B5G5R5A1_UNORM,true>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B5G5R5A1_UNORM,
DXGI_FORMAT_B5G5R5A1_UNORM,
DXGI_FORMAT_B5G5R5A1_UNORM,
......@@ -1410,7 +1410,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1426,7 +1426,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
......@@ -1442,7 +1442,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
......@@ -1458,7 +1458,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -1474,7 +1474,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
DXGI_FORMAT_UNKNOWN,
......@@ -1490,7 +1490,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1506,7 +1506,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -1522,7 +1522,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
......@@ -1538,7 +1538,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
......@@ -1554,7 +1554,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -1570,7 +1570,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
......@@ -1586,7 +1586,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
......@@ -1602,7 +1602,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (SupportsFormat<DXGI_FORMAT_B4G4R4A4_UNORM,false>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1611,7 +1611,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (SupportsFormat<DXGI_FORMAT_B4G4R4A4_UNORM,true>(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B4G4R4A4_UNORM,
DXGI_FORMAT_B4G4R4A4_UNORM,
DXGI_FORMAT_B4G4R4A4_UNORM,
......@@ -1627,7 +1627,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1643,7 +1643,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
......@@ -1659,7 +1659,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
......@@ -1675,7 +1675,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_UNKNOWN,
......@@ -1691,7 +1691,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN,
......@@ -1707,7 +1707,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
......@@ -1723,7 +1723,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
{
if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_X24_TYPELESS_G8_UINT,
DXGI_FORMAT_UNKNOWN,
......@@ -1732,7 +1732,7 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
else if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat &textureFormat = GetD3D11FormatInfo(internalFormat,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment