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 437 additions and 924 deletions
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
...@@ -41,11 +41,6 @@ namespace ...@@ -41,11 +41,6 @@ namespace
typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &); typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &);
bool AnyDevice(const Renderer11DeviceCaps &deviceCaps)
{{
return true;
}}
bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps) bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps)
{{ {{
return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0); return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0);
...@@ -256,18 +251,24 @@ def get_texture_format_item(idx, requirements_fn, angle_format): ...@@ -256,18 +251,24 @@ def get_texture_format_item(idx, requirements_fn, angle_format):
rtv_format = angle_format["rtvFormat"] if "rtvFormat" in angle_format else "DXGI_FORMAT_UNKNOWN" 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" dsv_format = angle_format["dsvFormat"] if "dsvFormat" in angle_format else "DXGI_FORMAT_UNKNOWN"
if idx == 0: indent = ' '
table_data += ' if (' + requirements_fn + '(renderer11DeviceCaps))\n' if requirements_fn != None:
else: if idx == 0:
table_data += ' else if (' + requirements_fn + '(renderer11DeviceCaps))\n' table_data += ' if (' + requirements_fn + '(renderer11DeviceCaps))\n'
table_data += ' {\n' else:
table_data += ' static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n' table_data += ' else if (' + requirements_fn + '(renderer11DeviceCaps))\n'
table_data += ' ' + tex_format + ',\n' table_data += ' {\n'
table_data += ' ' + srv_format + ',\n' indent += ' '
table_data += ' ' + rtv_format + ',\n'
table_data += ' ' + dsv_format + ');\n' table_data += indent + 'static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += ' return textureFormat;\n' table_data += indent + ' ' + tex_format + ',\n'
table_data += ' }\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 return table_data
...@@ -281,15 +282,15 @@ def parse_json_into_switch_string(json_map, json_data): ...@@ -281,15 +282,15 @@ def parse_json_into_switch_string(json_map, json_data):
table_data += ' {\n' table_data += ' {\n'
if isinstance(json_map[internal_format], basestring): 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: else:
for idx, requirements_map in enumerate(sorted(json_map[internal_format].iteritems())): 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 += 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 += ' else\n'
table_data += ' {\n'
table_data += ' break;\n'
table_data += ' }\n'
table_data += ' }\n' table_data += ' }\n'
return table_data return table_data
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
...@@ -29,11 +29,6 @@ namespace ...@@ -29,11 +29,6 @@ namespace
typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &); typedef bool (*FormatSupportFunction)(const Renderer11DeviceCaps &);
bool AnyDevice(const Renderer11DeviceCaps &deviceCaps)
{
return true;
}
bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps) bool OnlyFL10Plus(const Renderer11DeviceCaps &deviceCaps)
{ {
return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0); return (deviceCaps.featureLevel >= D3D_FEATURE_LEVEL_10_0);
...@@ -248,35 +243,21 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -248,35 +243,21 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_ALPHA16F_EXT: case GL_ALPHA16F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_ALPHA32F_EXT: case GL_ALPHA32F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_ALPHA8_EXT: case GL_ALPHA8_EXT:
{ {
...@@ -305,67 +286,39 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -305,67 +286,39 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_BGR5_A1_ANGLEX: case GL_BGR5_A1_ANGLEX:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_B8G8R8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_B8G8R8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_BGRA4_ANGLEX: case GL_BGRA4_ANGLEX:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_B8G8R8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_B8G8R8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_BGRA8_EXT: case GL_BGRA8_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_B8G8R8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_B8G8R8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_BGRA_EXT: case GL_BGRA_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_B8G8R8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_B8G8R8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_COMPRESSED_R11_EAC: case GL_COMPRESSED_R11_EAC:
{ {
...@@ -449,67 +402,39 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -449,67 +402,39 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_BC1_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE: case GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_BC2_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_BC2_UNORM,
DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE: case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_BC3_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_BC3_UNORM,
DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_BC1_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_COMPRESSED_SIGNED_R11_EAC: case GL_COMPRESSED_SIGNED_R11_EAC:
{ {
...@@ -734,659 +659,372 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -734,659 +659,372 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE: case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_BC1_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_ETC1_RGB8_OES: case GL_ETC1_RGB8_OES:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE: case GL_LUMINANCE:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE16F_EXT: case GL_LUMINANCE16F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE32F_EXT: case GL_LUMINANCE32F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE8_ALPHA8_EXT: case GL_LUMINANCE8_ALPHA8_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE8_EXT: case GL_LUMINANCE8_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE_ALPHA16F_EXT: case GL_LUMINANCE_ALPHA16F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_LUMINANCE_ALPHA32F_EXT: case GL_LUMINANCE_ALPHA32F_EXT:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_NONE: case GL_NONE:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_UNKNOWN,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R11F_G11F_B10F: case GL_R11F_G11F_B10F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R11G11B10_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R11G11B10_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R16F: case GL_R16F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R16I: case GL_R16I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R16_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R16UI: case GL_R16UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R32F: case GL_R32F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R32I: case GL_R32I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R32_SINT, DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R32_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R32UI: case GL_R32UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R8: case GL_R8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R8I: case GL_R8I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_R8_SINT, DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_R8_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R8UI: case GL_R8UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_R8_SNORM: case GL_R8_SNORM:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8_SNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG16F: case GL_RG16F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG16I: case GL_RG16I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG16UI: case GL_RG16UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG32F: case GL_RG32F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG32I: case GL_RG32I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG32UI: case GL_RG32UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG8: case GL_RG8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG8I: case GL_RG8I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG8UI: case GL_RG8UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RG8_SNORM: case GL_RG8_SNORM:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8_SNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB: case GL_RGB:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB10_A2: case GL_RGB10_A2:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R10G10B10A2_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R10G10B10A2_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB10_A2UI: case GL_RGB10_A2UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R10G10B10A2_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R10G10B10A2_UINT, DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R10G10B10A2_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R10G10B10A2_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB16F: case GL_RGB16F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB16I: case GL_RGB16I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB16UI: case GL_RGB16UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB32F: case GL_RGB32F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB32I: case GL_RGB32I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT, DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB32UI: case GL_RGB32UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT, DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB565: case GL_RGB565:
{ {
...@@ -1440,195 +1078,111 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1440,195 +1078,111 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_RGB8: case GL_RGB8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB8I: case GL_RGB8I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB8UI: case GL_RGB8UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB8_SNORM: case GL_RGB8_SNORM:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_SNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGB9_E5: case GL_RGB9_E5:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA: case GL_RGBA:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA16F: case GL_RGBA16F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA16I: case GL_RGBA16I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R16G16B16A16_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA16UI: case GL_RGBA16UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R16G16B16A16_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R16G16B16A16_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA32F: case GL_RGBA32F:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_FLOAT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_FLOAT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA32I: case GL_RGBA32I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT, DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32A32_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA32UI: case GL_RGBA32UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R32G32B32A32_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT, DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R32G32B32A32_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA4: case GL_RGBA4:
{ {
...@@ -1657,99 +1211,57 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -1657,99 +1211,57 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
} }
case GL_RGBA8: case GL_RGBA8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA8I: case GL_RGBA8I:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_SINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_SINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA8UI: case GL_RGBA8UI:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UINT,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UINT, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_RGBA8_SNORM: case GL_RGBA8_SNORM:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_SNORM,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_SRGB8: case GL_SRGB8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_UNKNOWN, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_SRGB8_ALPHA8: case GL_SRGB8_ALPHA8:
{ {
if (AnyDevice(renderer11DeviceCaps)) static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
{ DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, return textureFormat;
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else
{
break;
}
} }
case GL_STENCIL_INDEX8: case GL_STENCIL_INDEX8:
{ {
......
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