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 12 additions and 11 deletions
src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py
...@@ -248,24 +248,25 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat, ...@@ -248,24 +248,25 @@ const TextureFormat &GetTextureFormatInfo(GLenum internalFormat,
}} // namespace rx }} // namespace rx
""" """
tex_format = "texFormat"
srv_format = "srvFormat"
rtv_format = "rtvFormat"
dsv_format = "dsvFormat"
def get_texture_format_item(idx, texture_format): def get_texture_format_item(idx, texture_format):
table_data = ''; 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: if idx == 0:
table_data += ' if (' + texture_format["requirementsFcn"] + '(renderer11DeviceCaps))\n' table_data += ' if (' + requirements_fn + '(renderer11DeviceCaps))\n'
else: else:
table_data += ' else if (' + texture_format["requirementsFcn"] + '(renderer11DeviceCaps))\n' table_data += ' else if (' + requirements_fn + '(renderer11DeviceCaps))\n'
table_data += ' {\n' table_data += ' {\n'
table_data += ' static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n' table_data += ' static const TextureFormat textureFormat = GetD3D11FormatInfo(internalFormat,\n'
table_data += ' ' + texture_format[tex_format] + ',\n' table_data += ' ' + tex_format + ',\n'
table_data += ' ' + texture_format[srv_format] + ',\n' table_data += ' ' + srv_format + ',\n'
table_data += ' ' + texture_format[rtv_format] + ',\n' table_data += ' ' + rtv_format + ',\n'
table_data += ' ' + texture_format[dsv_format] + ');\n' table_data += ' ' + dsv_format + ');\n'
table_data += ' return textureFormat;\n' table_data += ' return textureFormat;\n'
table_data += ' }\n' table_data += ' }\n'
......
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