Skip to content

A
angle
Commit 569b9cb9 by Frank Henigman Committed by Commit Bot
Options

Fix run_code_generation.py hash calculation.

Open files with mode 'r' instead of 'rb' so the hash calculation produces the same results on Linux and Windows. Recalculate the hashes and proc_table_autogen.cpp which was out of date. BUG=angleproject:2711 Change-Id: I31562c96ce36e6df009c44c565fe9a3f1b5ba6c4 Reviewed-on: https://chromium-review.googlesource.com/1128549Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
parent efaa09fd
Showing with 55 additions and 52 deletions
scripts/run_code_generation.py
...@@ -162,7 +162,7 @@ generators = { ...@@ -162,7 +162,7 @@ generators = {
def md5(fname): def md5(fname):
hash_md5 = hashlib.md5() hash_md5 = hashlib.md5()
with open(fname, "rb") as f: with open(fname, "r") as f:
for chunk in iter(lambda: f.read(4096), b""): for chunk in iter(lambda: f.read(4096), b""):
hash_md5.update(chunk) hash_md5.update(chunk)
return hash_md5.hexdigest() return hash_md5.hexdigest()
......
scripts/run_code_generation_hashes.json
{ {
"ANGLE format:src/libANGLE/renderer/angle_format.py": "ANGLE format:src/libANGLE/renderer/angle_format.py":
"ddf4dae07bfad22bbf13f4b14e43d8f4", "826420a038032840f10d2d6066a01e7d",
"ANGLE format:src/libANGLE/renderer/angle_format_data.json": "ANGLE format:src/libANGLE/renderer/angle_format_data.json":
"3513511d9f0c7afd9dbc33d1d0de5987", "1ab73531d2d9655e669b5560fb43c698",
"ANGLE format:src/libANGLE/renderer/angle_format_map.json": "ANGLE format:src/libANGLE/renderer/angle_format_map.json":
"28aeb36a9cdb5262702d9f1e8b81b8ed", "82d80c3be2cdfcc17aec07cf2223907f",
"ANGLE format:src/libANGLE/renderer/gen_angle_format_table.py": "ANGLE format:src/libANGLE/renderer/gen_angle_format_table.py":
"aa268de9ae7424a83633656b97d8161d", "dcb81c64e2c89f57a7105ab07ef0ffd0",
"ANGLE load functions table:src/libANGLE/renderer/gen_load_functions_table.py": "ANGLE load functions table:src/libANGLE/renderer/gen_load_functions_table.py":
"de1532286bb6720c309f673a9630a132", "3fa54bf0a8911fa0cb102e569f1facbb",
"ANGLE load functions table:src/libANGLE/renderer/load_functions_data.json": "ANGLE load functions table:src/libANGLE/renderer/load_functions_data.json":
"976cac5f0dcb9b2a782b1b257819b71c", "21a603f6224d3b6cd606b71dca0ae181",
"D3D11 format:src/libANGLE/renderer/angle_format.py": "D3D11 format:src/libANGLE/renderer/angle_format.py":
"ddf4dae07bfad22bbf13f4b14e43d8f4", "826420a038032840f10d2d6066a01e7d",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py": "D3D11 format:src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py":
"2a6afa5c7381b3cba46bf4e19146511c", "1ab3a192c6bb23a926d0a5d0ed84cbf3",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_data.json": "D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_data.json":
"461eb24ff0b5c45f948568a46ba7416c", "fde460b6823388a8f27082ec266ad64f",
"D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_map.json": "D3D11 format:src/libANGLE/renderer/d3d/d3d11/texture_format_map.json":
"c60bd3863f0964ea6c3eee7d62d7fab2", "805d30e2443935e3a3bd68839699e171",
"DXGI format support:src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json": "DXGI format support:src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json":
"ed2631ebf8535890c03433a264bfe9b7", "09195053f8829fc81efe08229b54a8b5",
"DXGI format support:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py": "DXGI format support:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_support_tables.py":
"e5073223e0338d625a3ec3adb743fc1e", "30158f76e168e014a1bee3925cd5910a",
"DXGI format:src/libANGLE/renderer/angle_format.py": "DXGI format:src/libANGLE/renderer/angle_format.py":
"ddf4dae07bfad22bbf13f4b14e43d8f4", "826420a038032840f10d2d6066a01e7d",
"DXGI format:src/libANGLE/renderer/angle_format_map.json": "DXGI format:src/libANGLE/renderer/angle_format_map.json":
"28aeb36a9cdb5262702d9f1e8b81b8ed", "82d80c3be2cdfcc17aec07cf2223907f",
"DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json": "DXGI format:src/libANGLE/renderer/d3d/d3d11/dxgi_format_data.json":
"3607db87d772bddcfe8f7e4a247046fc", "24f525b05dc665fbbc8c6d68fb863719",
"DXGI format:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py": "DXGI format:src/libANGLE/renderer/d3d/d3d11/gen_dxgi_format_table.py":
"abe278e3e7d68b53ea44eabad7360954", "2932a5e1c3c846be0169e29a4f9c72e8",
"ESSL static builtins:src/compiler/translator/builtin_function_declarations.txt": "ESSL static builtins:src/compiler/translator/builtin_function_declarations.txt":
"b8b75e150cea623fdb7503e196fc67ef", "338ae4863ccaab54adccee8e3f7971cf",
"ESSL static builtins:src/compiler/translator/builtin_variables.json": "ESSL static builtins:src/compiler/translator/builtin_variables.json":
"fd8612ea296fe89f9a0c132018569753", "2c0e86ff9f92f79ada03f04206e63fba",
"ESSL static builtins:src/compiler/translator/gen_builtin_symbols.py": "ESSL static builtins:src/compiler/translator/gen_builtin_symbols.py":
"7f75b265cc4aeef2f9585348aa1f1267", "51afaa8fc47b537aa4e62552de9cc7c0",
"Emulated HLSL functions:src/compiler/translator/emulated_builtin_function_data_hlsl.json": "Emulated HLSL functions:src/compiler/translator/emulated_builtin_function_data_hlsl.json":
"6c908980bdfe28569d8f148326e748a4", "002ad46d144c51fe98d73478aa554ba7",
"Emulated HLSL functions:src/compiler/translator/gen_emulated_builtin_function_tables.py": "Emulated HLSL functions:src/compiler/translator/gen_emulated_builtin_function_tables.py":
"b43ad00aaca29f278b78986df2705f53", "6a00c1ba22c35a9b700a154efda6f861",
"GL copy conversion table:src/libANGLE/es3_copy_conversion_formats.json": "GL copy conversion table:src/libANGLE/es3_copy_conversion_formats.json":
"9ebd7404a10e4069485258db8fe3dffc", "54608f6f7d9aa7c59a8458ccf3ab9935",
"GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py": "GL copy conversion table:src/libANGLE/gen_copy_conversion_table.py":
"5218d44a5c02b7ac98599a7262375cc7", "ac1afe23d9578bd1d2ef74f4a7aa927a",
"GL entry point:scripts/entry_point_packed_gl_enums.json": "GL entry point:scripts/entry_point_packed_gl_enums.json":
"d409cb2e59a037e1d5698c6b00829c18", "154df93d8af5156b1f434a7a1a84b671",
"GL entry point:scripts/generate_entry_points.py": "GL entry point:scripts/generate_entry_points.py":
"57bea24a1a17f8076ed290c335a3208f", "c502f05207c8a2eb27ae67e48b5d02c2",
"GL entry point:scripts/gl.xml": "GL entry point:scripts/gl.xml":
"521a7e2337f60ba5aa5ae906f5d1a5c4", "b470cb06b06cbbe7adb2c8129ec85708",
"GL format map:src/libANGLE/es3_format_type_combinations.json": "GL format map:src/libANGLE/es3_format_type_combinations.json":
"0ae351748cdcd5fd2e7447416bac64b5", "a232823cd6430f14e28793ccabb968ee",
"GL format map:src/libANGLE/format_map_data.json": "GL format map:src/libANGLE/format_map_data.json":
"9a76bd8b82d2417dcd5c1ee2052f77b5", "81b2775940d4ba19f874c931dfdc239e",
"GL format map:src/libANGLE/gen_format_map.py": "GL format map:src/libANGLE/gen_format_map.py":
"87226f5d2224743f941026ec1c9489e5", "a383ee79a7bf929d145165f3e76c1079",
"OpenGL dispatch table:scripts/gl.xml": "OpenGL dispatch table:scripts/gl.xml":
"521a7e2337f60ba5aa5ae906f5d1a5c4", "b470cb06b06cbbe7adb2c8129ec85708",
"OpenGL dispatch table:src/libANGLE/renderer/gl/generate_gl_dispatch_table.py": "OpenGL dispatch table:src/libANGLE/renderer/gl/generate_gl_dispatch_table.py":
"98855aea9916706b384e8843fc8cc145", "71d2cd9c958ec5e13ce5e38bdb03dcb5",
"Vulkan format:src/libANGLE/renderer/angle_format.py": "Vulkan format:src/libANGLE/renderer/angle_format.py":
"ddf4dae07bfad22bbf13f4b14e43d8f4", "826420a038032840f10d2d6066a01e7d",
"Vulkan format:src/libANGLE/renderer/angle_format_map.json": "Vulkan format:src/libANGLE/renderer/angle_format_map.json":
"28aeb36a9cdb5262702d9f1e8b81b8ed", "82d80c3be2cdfcc17aec07cf2223907f",
"Vulkan format:src/libANGLE/renderer/vulkan/gen_vk_format_table.py": "Vulkan format:src/libANGLE/renderer/vulkan/gen_vk_format_table.py":
"be1ca0bd596cf826d8f38d110fba35b0", "85a1e412d2dc8d3c06a8f3249e0aae48",
"Vulkan format:src/libANGLE/renderer/vulkan/vk_format_map.json": "Vulkan format:src/libANGLE/renderer/vulkan/vk_format_map.json":
"f7d883e82c2d9f284e15edff3a1a7dcb", "0ea1d6c72f5ffabecbf8d5d68a527dc7",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
"d651e28ab62477029093152e37ed49c9", "c1cc895645db3fe1cd284352890c219e",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert":
"ab897aa9eb45f83f66080ee082e7d51e", "1743adf55153edf91363fa7b4350d859",
"Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/PushConstantColor.frag": "Vulkan internal shader programs:src/libANGLE/renderer/vulkan/shaders/src/PushConstantColor.frag":
"3b931f51bfee8310f3d6497d5c9ed8a1", "d4edeca8fcb5fc02aa5236c8d8b77a4d",
"Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py": "Vulkan mandatory format support table:src/libANGLE/renderer/angle_format.py":
"ddf4dae07bfad22bbf13f4b14e43d8f4", "826420a038032840f10d2d6066a01e7d",
"Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py": "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
"9f8beddd1c293787c851bb9dc42552cb", "e11137f0fdf1ff934d698b04c6f430cd",
"Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json": "Vulkan mandatory format support table:src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json":
"f9faa72f7d2b926e4eca5cc0ffb73feb", "fa2bd54c1bb0ab2cf1d386061a4bc5c5",
"Vulkan mandatory format support table:third_party/vulkan-headers/src/registry/vk.xml": "Vulkan mandatory format support table:third_party/vulkan-headers/src/registry/vk.xml":
"ef4320881fab0dd62df5f9e84b4ac117", "e21d71df417d9f90ef01417b25e78575",
"packed enum:src/common/gen_packed_gl_enums.py": "packed enum:src/common/gen_packed_gl_enums.py":
"878d244fb50d4163adcbfbce8a8c660c", "a9b1c38b4e4d8a1038e743be323f1a51",
"packed enum:src/common/packed_egl_enums.json": "packed enum:src/common/packed_egl_enums.json":
"4921ce9fc375dee01fe839e5f25b4a06", "0389a8a565ccee99163bd0cf3ca146d3",
"packed enum:src/common/packed_gl_enums.json": "packed enum:src/common/packed_gl_enums.json":
"44b4eb27ff237a096246e5fb31c64958", "8b60e7bae297eba956166422824d639c",
"proc table:src/libGLESv2/gen_proc_table.py": "proc table:src/libGLESv2/gen_proc_table.py":
"69518f0b2e34331f8c911e2602fe049d", "027bfd5a8a8dffe91f492bf199029cde",
"proc table:src/libGLESv2/proc_table_data.json": "proc table:src/libGLESv2/proc_table_data.json":
"52e9cae4a47cb00ee68633275603c6b4", "340bc0beb8a8a6824ae60ac2ec2768ab",
"uniform type:src/common/gen_uniform_type_table.py": "uniform type:src/common/gen_uniform_type_table.py":
"e892048b2185e3e661b8ba9c541834cc" "261d239af143eeb4bd3d69cdd53ee096"
} }
\ No newline at end of file
src/compiler/translator/builtin_symbols_hash_autogen.txt
35ac43f73bd7b675a938f550d518ea8f 71be250213ce3f9d36417ff880fb4100
\ No newline at end of file \ No newline at end of file
src/libGLESv2/proc_table_autogen.cpp
...@@ -824,6 +824,8 @@ ProcEntry g_procTable[] = { ...@@ -824,6 +824,8 @@ ProcEntry g_procTable[] = {
{"glMatrixIndexPointerOESContextANGLE", P(gl::MatrixIndexPointerOESContextANGLE)}, {"glMatrixIndexPointerOESContextANGLE", P(gl::MatrixIndexPointerOESContextANGLE)},
{"glMatrixMode", P(gl::MatrixMode)}, {"glMatrixMode", P(gl::MatrixMode)},
{"glMatrixModeContextANGLE", P(gl::MatrixModeContextANGLE)}, {"glMatrixModeContextANGLE", P(gl::MatrixModeContextANGLE)},
{"glMaxShaderCompilerThreadsKHR", P(gl::MaxShaderCompilerThreadsKHR)},
{"glMaxShaderCompilerThreadsKHRContextANGLE", P(gl::MaxShaderCompilerThreadsKHRContextANGLE)},
{"glMemoryBarrier", P(gl::MemoryBarrier)}, {"glMemoryBarrier", P(gl::MemoryBarrier)},
{"glMemoryBarrierByRegion", P(gl::MemoryBarrierByRegion)}, {"glMemoryBarrierByRegion", P(gl::MemoryBarrierByRegion)},
{"glMemoryBarrierByRegionContextANGLE", P(gl::MemoryBarrierByRegionContextANGLE)}, {"glMemoryBarrierByRegionContextANGLE", P(gl::MemoryBarrierByRegionContextANGLE)},
...@@ -1237,5 +1239,5 @@ ProcEntry g_procTable[] = { ...@@ -1237,5 +1239,5 @@ ProcEntry g_procTable[] = {
{"glWeightPointerOES", P(gl::WeightPointerOES)}, {"glWeightPointerOES", P(gl::WeightPointerOES)},
{"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}}; {"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
size_t g_numProcs = 1169; size_t g_numProcs = 1171;
} // namespace egl } // namespace egl
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