Skip to content

A
angle
Commit 6e4d1d21 by Jamie Madill Committed by Commit Bot
Options

D3D11: Simplify load function table init.

Now that C++11 constructor syntax is allowed, we can use a much simpler scheme. BUG=angleproject:1407 BUG=chromium:616176 Change-Id: Ida5f235c3ed1429564af5213a5fead6c3b896080 Reviewed-on: https://chromium-review.googlesource.com/350903Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 768996c0
Showing with 3 additions and 5 deletions
src/libANGLE/renderer/d3d/d3d11/gen_load_functions_table.py
...@@ -98,7 +98,7 @@ dxgi_format_param = 'dxgiFormat' ...@@ -98,7 +98,7 @@ dxgi_format_param = 'dxgiFormat'
dxgi_format_unknown = "DXGI_FORMAT_UNKNOWN" dxgi_format_unknown = "DXGI_FORMAT_UNKNOWN"
def get_function_maps_string(typestr, function, requiresConversion): def get_function_maps_string(typestr, function, requiresConversion):
return ' loadMap[' + typestr + '] = LoadImageFunctionInfo(' + function + ', ' + requiresConversion + ');\n' return ' { ' + typestr + ', LoadImageFunctionInfo(' + function + ', ' + requiresConversion + ') },\n'
def get_unknown_format_string(dxgi_to_type_map, dxgi_unknown_string): def get_unknown_format_string(dxgi_to_type_map, dxgi_unknown_string):
if dxgi_unknown_string not in dxgi_to_type_map: if dxgi_unknown_string not in dxgi_to_type_map:
...@@ -126,11 +126,9 @@ def create_dxgi_to_type_map(dst, json_data, internal_format_str): ...@@ -126,11 +126,9 @@ def create_dxgi_to_type_map(dst, json_data, internal_format_str):
def get_load_function_map_snippet(insert_map_string): def get_load_function_map_snippet(insert_map_string):
load_function_map_snippet = '' load_function_map_snippet = ''
load_function_map_snippet += ' static const std::map<GLenum, LoadImageFunctionInfo> loadFunctionsMap = []() {\n' load_function_map_snippet += ' static const std::map<GLenum, LoadImageFunctionInfo> loadFunctionsMap = {\n'
load_function_map_snippet += ' std::map<GLenum, LoadImageFunctionInfo> loadMap;\n'
load_function_map_snippet += insert_map_string load_function_map_snippet += insert_map_string
load_function_map_snippet += ' return loadMap;\n' load_function_map_snippet += ' };\n\n'
load_function_map_snippet += ' }();\n\n'
load_function_map_snippet += ' return loadFunctionsMap;\n' load_function_map_snippet += ' return loadFunctionsMap;\n'
return load_function_map_snippet return load_function_map_snippet
......
src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
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