Skip to content

A
angle
Commit ea6b6376 by Olli Etuaho Committed by Commit Bot
Options

Remove AnyDevice from gen_texture_format_table

This makes the generated code easier to read. BUG=angleproject:1318 BUG=angleproject:1244 TEST=angle_end2end_tests Change-Id: I6f232f3b8959cf8c72efb1e68b3fae6358b7b698 Reviewed-on: https://chromium-review.googlesource.com/328252Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent a615852d
Showing with 14 additions and 501 deletions
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
......@@ -41,11 +41,6 @@ namespace
typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &);
bool AnyDevice(const Renderer11DeviceCaps &deviceCaps)
{{
return true;
}}
bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps)
{{
return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0);
......@@ -256,17 +251,23 @@ def get_texture_format_item(idx, requirements_fn, angle_format):
rtv_format = angle_format["rtvFormat"] if "rtvFormat" in angle_format else "DXGI_FORMAT_UNKNOWN"
dsv_format = angle_format["dsvFormat"] if "dsvFormat" in angle_format else "DXGI_FORMAT_UNKNOWN"
indent = ' '
if requirements_fn != None:
if idx == 0:
table_data += ' if (' + requirements_fn + '(renderer11DeviceCaps))\n'
else:
table_data += ' else if (' + requirements_fn + '(renderer11DeviceCaps))\n'
table_data += ' {\n'
table_data += ' static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += ' ' + tex_format + ',\n'
table_data += ' ' + srv_format + ',\n'
table_data += ' ' + rtv_format + ',\n'
table_data += ' ' + dsv_format + ');\n'
table_data += ' return textureFormat;\n'
indent += ' '
table_data += indent + 'static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += indent + ' ' + tex_format + ',\n'
table_data += indent + ' ' + srv_format + ',\n'
table_data += indent + ' ' + rtv_format + ',\n'
table_data += indent + ' ' + dsv_format + ');\n'
table_data += indent + 'return textureFormat;\n'
if requirements_fn != None:
table_data += ' }\n'
return table_data
......@@ -281,15 +282,15 @@ def parse_json_into_switch_string(json_map, json_data):
table_data += ' {\n'
if isinstance(json_map[internal_format], basestring):
table_data += get_texture_format_item(0, "AnyDevice", json_data[json_map[internal_format]])
table_data += get_texture_format_item(0, None, json_data[json_map[internal_format]])
else:
for idx, requirements_map in enumerate(sorted(json_map[internal_format].iteritems())):
table_data += get_texture_format_item(idx, requirements_map[0], json_data[requirements_map[1]])
table_data += ' else\n'
table_data += ' {\n'
table_data += ' break;\n'
table_data += ' }\n'
table_data += ' }\n'
return table_data
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
......@@ -29,11 +29,6 @@ namespace
typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &);
bool AnyDevice(const Renderer11DeviceCaps &deviceCaps)
{
return true;
}
bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps)
{
return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0);
......@@ -248,8 +243,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_ALPHA16F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -257,15 +250,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_ALPHA32F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -273,11 +259,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_ALPHA8_EXT:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
......@@ -305,8 +286,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_BGR5_A1_ANGLEX:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -314,15 +293,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_BGRA4_ANGLEX:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -330,15 +302,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_BGRA8_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -346,15 +311,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_BGRA_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
......@@ -362,11 +320,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_COMPRESSED_R11_EAC:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
......@@ -449,8 +402,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM,
......@@ -458,15 +409,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC2_UNORM,
DXGI_FORMAT_BC2_UNORM,
......@@ -474,15 +418,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC3_UNORM,
DXGI_FORMAT_BC3_UNORM,
......@@ -490,15 +427,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM,
......@@ -506,11 +436,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_COMPRESSED_SIGNED_R11_EAC:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
......@@ -734,8 +659,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM,
......@@ -743,15 +666,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_ETC1_RGB8_OES:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -759,15 +675,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -775,15 +684,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE16F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -791,15 +693,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE32F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -807,15 +702,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE8_ALPHA8_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -823,15 +711,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE8_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -839,15 +720,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE_ALPHA:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -855,15 +729,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE_ALPHA16F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -871,15 +738,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_LUMINANCE_ALPHA32F_EXT:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -887,15 +747,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_NONE:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
......@@ -903,15 +756,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R11F_G11F_B10F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R11G11B10_FLOAT,
......@@ -919,15 +765,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R16F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R16_FLOAT,
......@@ -935,15 +774,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R16I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R16_SINT,
......@@ -951,15 +783,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R16UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_UINT,
......@@ -967,15 +792,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R32F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_FLOAT,
......@@ -983,15 +801,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R32I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R32_SINT,
......@@ -999,15 +810,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R32UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_UINT,
......@@ -1015,15 +819,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM,
......@@ -1031,15 +828,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R8I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_R8_SINT,
......@@ -1047,15 +837,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R8UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_UINT,
......@@ -1063,15 +846,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_R8_SNORM:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SNORM,
......@@ -1079,15 +855,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG16F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_FLOAT,
......@@ -1095,15 +864,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG16I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R16G16_SINT,
......@@ -1111,15 +873,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG16UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_UINT,
......@@ -1127,15 +882,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG32F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_FLOAT,
......@@ -1143,15 +891,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG32I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G32_SINT,
......@@ -1159,15 +900,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG32UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_UINT,
......@@ -1175,15 +909,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM,
......@@ -1191,15 +918,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG8I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R8G8_SINT,
......@@ -1207,15 +927,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG8UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_UINT,
......@@ -1223,15 +936,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RG8_SNORM:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SNORM,
......@@ -1239,15 +945,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1255,15 +954,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB10_A2:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UNORM,
......@@ -1271,15 +963,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB10_A2UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R10G10B10A2_UINT,
......@@ -1287,15 +972,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB16F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -1303,15 +981,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB16I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
......@@ -1319,15 +990,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB16UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
......@@ -1335,15 +999,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB32F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -1351,15 +1008,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB32I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
......@@ -1367,15 +1017,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB32UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
......@@ -1383,11 +1026,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB565:
{
if (SupportsFormat<DXGI_FORMAT_B5G6R5_UNORM,false>(renderer11DeviceCaps))
......@@ -1440,8 +1078,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_RGB8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1449,15 +1085,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB8I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
......@@ -1465,15 +1094,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB8UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
......@@ -1481,15 +1103,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB8_SNORM:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM,
......@@ -1497,15 +1112,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGB9_E5:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
......@@ -1513,15 +1121,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1529,15 +1130,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA16F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT,
......@@ -1545,15 +1139,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA16I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT,
......@@ -1561,15 +1148,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA16UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT,
......@@ -1577,15 +1157,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA32F:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT,
......@@ -1593,15 +1166,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA32I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT,
......@@ -1609,15 +1175,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA32UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT,
......@@ -1625,11 +1184,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA4:
{
if (SupportsFormat<DXGI_FORMAT_B4G4R4A4_UNORM,false>(renderer11DeviceCaps))
......@@ -1657,8 +1211,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_RGBA8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM,
......@@ -1666,15 +1218,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA8I:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT,
......@@ -1682,15 +1227,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA8UI:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT,
......@@ -1698,15 +1236,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_RGBA8_SNORM:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM,
......@@ -1714,15 +1245,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_SRGB8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
......@@ -1730,15 +1254,8 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_SRGB8_ALPHA8:
{
if (AnyDevice(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
......@@ -1746,11 +1263,6 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
}
case GL_STENCIL_INDEX8:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
......
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