Skip to content

A
angle
Commit 7c8d1d84 by Jamie Madill
Options

D3D11: Use default arguments in texture format table.

This reduces the footprint of the table considerably, and makes it a little bit easier to maintain. BUG=angleproject:1244 Change-Id: I84710729b94ba78813f9be2fcadb8c4d51fe8d7d Reviewed-on: https://chromium-review.googlesource.com/317330 Tryjob-Request: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 457f1d92
Showing with 120 additions and 323 deletions
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
......@@ -248,24 +248,25 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}} // namespace rx
"""
tex_format = "texFormat"
srv_format = "srvFormat"
rtv_format = "rtvFormat"
dsv_format = "dsvFormat"
def get_texture_format_item(idx, texture_format):
table_data = '';
tex_format = texture_format["texFormat"] if "texFormat" in texture_format else "DXGI_FORMAT_UNKNOWN"
srv_format = texture_format["srvFormat"] if "srvFormat" in texture_format else "DXGI_FORMAT_UNKNOWN"
rtv_format = texture_format["rtvFormat"] if "rtvFormat" in texture_format else "DXGI_FORMAT_UNKNOWN"
dsv_format = texture_format["dsvFormat"] if "dsvFormat" in texture_format else "DXGI_FORMAT_UNKNOWN"
requirements_fn = texture_format["requirementsFcn"] if "requirementsFcn" in texture_format else "AnyDevice"
if idx == 0:
table_data += ' if (' + texture_format["requirementsFcn"] + '(renderer11DeviceCaps))\n'
table_data += ' if (' + requirements_fn + '(renderer11DeviceCaps))\n'
else:
table_data += ' else if (' + texture_format["requirementsFcn"] + '(renderer11DeviceCaps))\n'
table_data += ' else if (' + requirements_fn + '(renderer11DeviceCaps))\n'
table_data += ' {\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'
table_data += ' ' + texture_format[dsv_format] + ');\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'
table_data += ' }\n'
......
src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
......@@ -4,14 +4,12 @@
"texFormat": "DXGI_FORMAT_A8_UNORM",
"srvFormat": "DXGI_FORMAT_A8_UNORM",
"rtvFormat": "DXGI_FORMAT_A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL9_3"
}
],
......@@ -19,18 +17,14 @@
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT"
}
],
"GL_ALPHA32F_EXT": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT"
}
],
"GL_ALPHA8_EXT": [
......@@ -38,14 +32,12 @@
"texFormat": "DXGI_FORMAT_A8_UNORM",
"srvFormat": "DXGI_FORMAT_A8_UNORM",
"rtvFormat": "DXGI_FORMAT_A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL9_3"
}
],
......@@ -53,44 +45,34 @@
{
"texFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM"
}
],
"GL_BGRA4_ANGLEX": [
{
"texFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM"
}
],
"GL_BGRA8_EXT": [
{
"texFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM"
}
],
"GL_BGRA_EXT": [
{
"texFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"srvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_B8G8R8A8_UNORM"
}
],
"GL_COMPRESSED_R11_EAC": [
{
"texFormat": "DXGI_FORMAT_R8_UNORM",
"srvFormat": "DXGI_FORMAT_R8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -98,8 +80,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -107,8 +87,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -116,8 +94,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -125,53 +101,37 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
"GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": [
{
"texFormat": "DXGI_FORMAT_BC1_UNORM",
"srvFormat": "DXGI_FORMAT_BC1_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_BC1_UNORM"
}
],
"GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": [
{
"texFormat": "DXGI_FORMAT_BC2_UNORM",
"srvFormat": "DXGI_FORMAT_BC2_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_BC2_UNORM"
}
],
"GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE": [
{
"texFormat": "DXGI_FORMAT_BC3_UNORM",
"srvFormat": "DXGI_FORMAT_BC3_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_BC3_UNORM"
}
],
"GL_COMPRESSED_RGB_S3TC_DXT1_EXT": [
{
"texFormat": "DXGI_FORMAT_BC1_UNORM",
"srvFormat": "DXGI_FORMAT_BC1_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_BC1_UNORM"
}
],
"GL_COMPRESSED_SIGNED_R11_EAC": [
{
"texFormat": "DXGI_FORMAT_R8_SNORM",
"srvFormat": "DXGI_FORMAT_R8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -179,8 +139,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8_SNORM",
"srvFormat": "DXGI_FORMAT_R8G8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -188,8 +146,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -197,8 +153,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -206,8 +160,6 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL10Plus"
}
],
......@@ -215,14 +167,11 @@
{
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
"srvFormat": "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL9_3"
}
......@@ -231,15 +180,10 @@
{
"texFormat": "DXGI_FORMAT_R32G8X24_TYPELESS",
"srvFormat": "DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D32_FLOAT_S8X24_UINT",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_UNKNOWN",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL9_3"
}
],
......@@ -247,14 +191,11 @@
{
"texFormat": "DXGI_FORMAT_R16_TYPELESS",
"srvFormat": "DXGI_FORMAT_R16_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D16_UNORM",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_D16_UNORM",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D16_UNORM",
"requirementsFcn": "OnlyFL9_3"
}
......@@ -263,14 +204,11 @@
{
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
"srvFormat": "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL9_3"
}
......@@ -279,15 +217,10 @@
{
"texFormat": "DXGI_FORMAT_R32_TYPELESS",
"srvFormat": "DXGI_FORMAT_R32_FLOAT",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D32_FLOAT",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_UNKNOWN",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "OnlyFL9_3"
}
],
......@@ -295,7 +228,6 @@
{
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
"srvFormat": "DXGI_FORMAT_R24_UNORM_X8_TYPELESS",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL10Plus"
}
......@@ -303,361 +235,275 @@
"GL_ETC1_RGB8_OES": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_LUMINANCE": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_LUMINANCE16F_EXT": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT"
}
],
"GL_LUMINANCE32F_EXT": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT"
}
],
"GL_LUMINANCE8_ALPHA8_EXT": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_LUMINANCE8_EXT": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_LUMINANCE_ALPHA": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_LUMINANCE_ALPHA16F_EXT": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT"
}
],
"GL_LUMINANCE_ALPHA32F_EXT": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT"
}
],
"GL_NONE": [
{
"texFormat": "DXGI_FORMAT_UNKNOWN",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
}
],
"GL_R11F_G11F_B10F": [
{
"texFormat": "DXGI_FORMAT_R11G11B10_FLOAT",
"srvFormat": "DXGI_FORMAT_R11G11B10_FLOAT",
"rtvFormat": "DXGI_FORMAT_R11G11B10_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R11G11B10_FLOAT"
}
],
"GL_R16F": [
{
"texFormat": "DXGI_FORMAT_R16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16_FLOAT"
}
],
"GL_R16I": [
{
"texFormat": "DXGI_FORMAT_R16_SINT",
"srvFormat": "DXGI_FORMAT_R16_SINT",
"rtvFormat": "DXGI_FORMAT_R16_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16_SINT"
}
],
"GL_R16UI": [
{
"texFormat": "DXGI_FORMAT_R16_UINT",
"srvFormat": "DXGI_FORMAT_R16_UINT",
"rtvFormat": "DXGI_FORMAT_R16_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16_UINT"
}
],
"GL_R32F": [
{
"texFormat": "DXGI_FORMAT_R32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32_FLOAT"
}
],
"GL_R32I": [
{
"texFormat": "DXGI_FORMAT_R32_SINT",
"srvFormat": "DXGI_FORMAT_R32_SINT",
"rtvFormat": "DXGI_FORMAT_R32_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32_SINT"
}
],
"GL_R32UI": [
{
"texFormat": "DXGI_FORMAT_R32_UINT",
"srvFormat": "DXGI_FORMAT_R32_UINT",
"rtvFormat": "DXGI_FORMAT_R32_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32_UINT"
}
],
"GL_R8": [
{
"texFormat": "DXGI_FORMAT_R8_UNORM",
"srvFormat": "DXGI_FORMAT_R8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8_UNORM"
}
],
"GL_R8I": [
{
"texFormat": "DXGI_FORMAT_R8_SINT",
"srvFormat": "DXGI_FORMAT_R8_SINT",
"rtvFormat": "DXGI_FORMAT_R8_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8_SINT"
}
],
"GL_R8UI": [
{
"texFormat": "DXGI_FORMAT_R8_UINT",
"srvFormat": "DXGI_FORMAT_R8_UINT",
"rtvFormat": "DXGI_FORMAT_R8_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8_UINT"
}
],
"GL_R8_SNORM": [
{
"texFormat": "DXGI_FORMAT_R8_SNORM",
"srvFormat": "DXGI_FORMAT_R8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8_SNORM"
}
],
"GL_RG16F": [
{
"texFormat": "DXGI_FORMAT_R16G16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16_FLOAT"
}
],
"GL_RG16I": [
{
"texFormat": "DXGI_FORMAT_R16G16_SINT",
"srvFormat": "DXGI_FORMAT_R16G16_SINT",
"rtvFormat": "DXGI_FORMAT_R16G16_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16_SINT"
}
],
"GL_RG16UI": [
{
"texFormat": "DXGI_FORMAT_R16G16_UINT",
"srvFormat": "DXGI_FORMAT_R16G16_UINT",
"rtvFormat": "DXGI_FORMAT_R16G16_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16_UINT"
}
],
"GL_RG32F": [
{
"texFormat": "DXGI_FORMAT_R32G32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32_FLOAT"
}
],
"GL_RG32I": [
{
"texFormat": "DXGI_FORMAT_R32G32_SINT",
"srvFormat": "DXGI_FORMAT_R32G32_SINT",
"rtvFormat": "DXGI_FORMAT_R32G32_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32_SINT"
}
],
"GL_RG32UI": [
{
"texFormat": "DXGI_FORMAT_R32G32_UINT",
"srvFormat": "DXGI_FORMAT_R32G32_UINT",
"rtvFormat": "DXGI_FORMAT_R32G32_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32_UINT"
}
],
"GL_RG8": [
{
"texFormat": "DXGI_FORMAT_R8G8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8_UNORM"
}
],
"GL_RG8I": [
{
"texFormat": "DXGI_FORMAT_R8G8_SINT",
"srvFormat": "DXGI_FORMAT_R8G8_SINT",
"rtvFormat": "DXGI_FORMAT_R8G8_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8_SINT"
}
],
"GL_RG8UI": [
{
"texFormat": "DXGI_FORMAT_R8G8_UINT",
"srvFormat": "DXGI_FORMAT_R8G8_UINT",
"rtvFormat": "DXGI_FORMAT_R8G8_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8_UINT"
}
],
"GL_RG8_SNORM": [
{
"texFormat": "DXGI_FORMAT_R8G8_SNORM",
"srvFormat": "DXGI_FORMAT_R8G8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8G8_SNORM"
}
],
"GL_RGB": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_RGB10_A2": [
{
"texFormat": "DXGI_FORMAT_R10G10B10A2_UNORM",
"srvFormat": "DXGI_FORMAT_R10G10B10A2_UNORM",
"rtvFormat": "DXGI_FORMAT_R10G10B10A2_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R10G10B10A2_UNORM"
}
],
"GL_RGB10_A2UI": [
{
"texFormat": "DXGI_FORMAT_R10G10B10A2_UINT",
"srvFormat": "DXGI_FORMAT_R10G10B10A2_UINT",
"rtvFormat": "DXGI_FORMAT_R10G10B10A2_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R10G10B10A2_UINT"
}
],
"GL_RGB16F": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT"
}
],
"GL_RGB16I": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_SINT"
}
],
"GL_RGB16UI": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_UINT"
}
],
"GL_RGB32F": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT"
}
],
"GL_RGB32I": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_SINT"
}
],
"GL_RGB32UI": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_UINT"
}
],
"GL_RGB565": [
......@@ -665,14 +511,12 @@
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B5G6R5_UNORM,false>"
},
{
"texFormat": "DXGI_FORMAT_B5G6R5_UNORM",
"srvFormat": "DXGI_FORMAT_B5G6R5_UNORM",
"rtvFormat": "DXGI_FORMAT_B5G6R5_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B5G6R5_UNORM,true>"
}
],
......@@ -681,14 +525,12 @@
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B5G5R5A1_UNORM,false>"
},
{
"texFormat": "DXGI_FORMAT_B5G5R5A1_UNORM",
"srvFormat": "DXGI_FORMAT_B5G5R5A1_UNORM",
"rtvFormat": "DXGI_FORMAT_B5G5R5A1_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B5G5R5A1_UNORM,true>"
}
],
......@@ -696,108 +538,82 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_RGB8I": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_SINT"
}
],
"GL_RGB8UI": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UINT"
}
],
"GL_RGB8_SNORM": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SNORM"
}
],
"GL_RGB9_E5": [
{
"texFormat": "DXGI_FORMAT_R9G9B9E5_SHAREDEXP",
"srvFormat": "DXGI_FORMAT_R9G9B9E5_SHAREDEXP",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R9G9B9E5_SHAREDEXP"
}
],
"GL_RGBA": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_RGBA16F": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_FLOAT"
}
],
"GL_RGBA16I": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_SINT"
}
],
"GL_RGBA16UI": [
{
"texFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"srvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R16G16B16A16_UINT"
}
],
"GL_RGBA32F": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_FLOAT"
}
],
"GL_RGBA32I": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_SINT"
}
],
"GL_RGBA32UI": [
{
"texFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"srvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R32G32B32A32_UINT"
}
],
"GL_RGBA4": [
......@@ -805,14 +621,12 @@
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B4G4R4A4_UNORM,false>"
},
{
"texFormat": "DXGI_FORMAT_B4G4R4A4_UNORM",
"srvFormat": "DXGI_FORMAT_B4G4R4A4_UNORM",
"rtvFormat": "DXGI_FORMAT_B4G4R4A4_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "SupportsFormat<DXGI_FORMAT_B4G4R4A4_UNORM,true>"
}
],
......@@ -820,70 +634,53 @@
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM"
}
],
"GL_RGBA8I": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_SINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_SINT"
}
],
"GL_RGBA8UI": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UINT",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UINT"
}
],
"GL_RGBA8_SNORM": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SNORM",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8G8B8A8_SNORM"
}
],
"GL_SRGB8": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB"
}
],
"GL_SRGB8_ALPHA8": [
{
"texFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB",
"dsvFormat": "DXGI_FORMAT_UNKNOWN",
"requirementsFcn": "AnyDevice"
"rtvFormat": "DXGI_FORMAT_R8G8B8A8_UNORM_SRGB"
}
],
"GL_STENCIL_INDEX8": [
{
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
"srvFormat": "DXGI_FORMAT_X24_TYPELESS_G8_UINT",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL10Plus"
},
{
"texFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"srvFormat": "DXGI_FORMAT_UNKNOWN",
"rtvFormat": "DXGI_FORMAT_UNKNOWN",
"dsvFormat": "DXGI_FORMAT_D24_UNORM_S8_UINT",
"requirementsFcn": "OnlyFL9_3"
}
]
}
\ No newline at end of file
}
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
......@@ -593,20 +593,20 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_DEPTH24_STENCIL8:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
......@@ -618,22 +618,22 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_DEPTH32F_STENCIL8:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G8X24_TYPELESS,
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D32_FLOAT_S8X24_UINT);
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32G8X24_TYPELESS,
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_D32_FLOAT_S8X24_UINT);
return textureFormat;
}
else
......@@ -643,20 +643,20 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_DEPTH_COMPONENT16:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R16_TYPELESS,
DXGI_FORMAT_R16_UNORM,
DXGI_FORMAT_D16_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D16_UNORM);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D16_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R16_TYPELESS,
DXGI_FORMAT_R16_UNORM,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D16_UNORM);
return textureFormat;
......@@ -668,20 +668,20 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_DEPTH_COMPONENT24:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
......@@ -693,22 +693,22 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_DEPTH_COMPONENT32F:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_TYPELESS,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D32_FLOAT);
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R32_TYPELESS,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN);
DXGI_FORMAT_D32_FLOAT);
return textureFormat;
}
else
......@@ -1737,20 +1737,20 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}
case GL_STENCIL_INDEX8:
{
if (OnlyFL10Plus(renderer11DeviceCaps))
if (OnlyFL9_3(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_X24_TYPELESS_G8_UINT,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
}
else if (OnlyFL9_3(renderer11DeviceCaps))
else if (OnlyFL10Plus(renderer11DeviceCaps))
{
static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_X24_TYPELESS_G8_UINT,
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_D24_UNORM_S8_UINT);
return textureFormat;
......
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