Skip to content

A
angle
Commit 28efd82c by Olli Etuaho Committed by Commit Bot
Options

Fix dxgi support table generation script

The previous patch edited the generated file manually. Fix the script to generate the file so that angle_white_box_tests pass. BUG=angleproject:2300 TEST=angle_white_box_tests Change-Id: Ie8f182b515721a56d6a2da2dac316aa4e296f005 Reviewed-on: https://chromium-review.googlesource.com/870113Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent b745f172
Showing with 9 additions and 6 deletions
src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
...@@ -1005,11 +1005,11 @@ ...@@ -1005,11 +1005,11 @@
"texture2D": "check", "texture2D": "check",
"texture3D": "check", "texture3D": "check",
"textureCube": "check", "textureCube": "check",
"shaderSample": "10_0check11_0always", "shaderSample": "9_3check11_0always",
"renderTarget": "11_0", "renderTarget": "dxgi1_2",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "never" "mipAutoGen": "dxgi1_2"
}, },
"DXGI_FORMAT_B8G8R8X8_TYPELESS": "DXGI_FORMAT_B8G8R8X8_TYPELESS":
{ {
......
src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
...@@ -99,7 +99,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat) ...@@ -99,7 +99,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
{ {
static const DXGISupport info(F_MIPGEN | F_RT | F_SAMPLE, F_DS, F_2D | F_3D | F_CUBE | F_MS); static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
return info; return info;
} }
case DXGI_FORMAT_B8G8R8X8_TYPELESS: case DXGI_FORMAT_B8G8R8X8_TYPELESS:
...@@ -692,7 +692,7 @@ const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat) ...@@ -692,7 +692,7 @@ const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
{ {
static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE); static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
return info; return info;
} }
case DXGI_FORMAT_B8G8R8X8_TYPELESS: case DXGI_FORMAT_B8G8R8X8_TYPELESS:
...@@ -1285,7 +1285,7 @@ const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat) ...@@ -1285,7 +1285,7 @@ const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
{ {
static const DXGISupport info(F_MIPGEN, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_RT | F_SAMPLE); static const DXGISupport info(F_MIPGEN | F_RT, F_DS, F_2D | F_3D | F_CUBE | F_MS | F_SAMPLE);
return info; return info;
} }
case DXGI_FORMAT_B8G8R8X8_TYPELESS: case DXGI_FORMAT_B8G8R8X8_TYPELESS:
......
src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py
...@@ -231,6 +231,9 @@ def do_format(format_data): ...@@ -231,6 +231,9 @@ def do_format(format_data):
elif support == '9_3check_10_0always': elif support == '9_3check_10_0always':
fl_9_3_check.update(d3d_flag) fl_9_3_check.update(d3d_flag)
fl_10_0_supported.update(d3d_flag) fl_10_0_supported.update(d3d_flag)
elif support == '9_3check11_0always':
fl_9_3_check.update(d3d_flag)
fl_10_0_check_11_0_supported.update(d3d_flag)
else: else:
print("Data specification error: " + support) print("Data specification error: " + support)
sys.exit(1) sys.exit(1)
......
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