Commit 79ae150e by Jamie Madill

Revert "Add baked DXGI format info for 2D/3D/Cube textures."

Hidden conflict with Geoff's test refactor patch. BUG=angleproject:1014 This reverts commit a3028ab9. Change-Id: Ic202e377032e9c74f62450ba0ffcba85a1fc0cc7 Reviewed-on: https://chromium-review.googlesource.com/276773Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent a3028ab9
...@@ -143,39 +143,23 @@ def do_format(format_data): ...@@ -143,39 +143,23 @@ def do_format(format_data):
for format_name, format_support in sorted(format_data.iteritems()): for format_name, format_support in sorted(format_data.iteritems()):
always_supported = set() always_supported = []
never_supported = set() never_supported = []
optionally_supported = set() optionally_supported = []
fl_11_0_supported = set()
for json_flag, support in format_support.iteritems(): for json_flag, support in format_support.iteritems():
d3d_flag = [json_flag_to_d3d[json_flag]] d3d_flag = json_flag_to_d3d[json_flag]
if support == 'check': # TODO(jmadill): process different support
optionally_supported.update(d3d_flag) if support != 'check':
elif support == 'always':
always_supported.update(d3d_flag)
elif support == 'never':
never_supported.update(d3d_flag)
elif support == '11_0':
fl_11_0_supported.update(d3d_flag)
elif support == '11_1':
# TODO(jmadill): D3D 11.1 handling
never_supported.update(d3d_flag)
elif support == 'dxgi1_2':
# TODO(jmadill): DXGI 1.2 handling.
always_supported.update(d3d_flag)
else:
print("Data specification error: " + support) print("Data specification error: " + support)
sys.exit(1) sys.exit(1)
for feature_level in ['10_0', '10_1', '11_0']: optionally_supported += [d3d_flag]
always_for_fl = always_supported
if feature_level == '11_0':
always_for_fl = fl_11_0_supported.union(always_for_fl)
always = ' | '.join(sorted(always_for_fl)) for feature_level in ['10_0', '10_1', '11_0']:
always = ' | '.join(sorted(always_supported))
never = ' | '.join(sorted(never_supported)) never = ' | '.join(sorted(never_supported))
optional = ' | '.join(sorted(optionally_supported)) optional = ' | '.join(sorted(optionally_supported))
......
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