Fix run_code_generation for huge diffs.

include/GLES/glext_explicit_context_autogen.inc

@@ -257,4 +257,4 @@ GL_API void GL_APIENTRY glTexGenivOESContextANGLE(GLeglContext ctx, GLenum coord
 GL_API void GL_APIENTRY glTexGenxOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, GLfixed param);
 GL_API void GL_APIENTRY glTexGenxvOESContextANGLE(GLeglContext ctx, GLenum coord, GLenum pname, const GLfixed *params);
 GL_API void GL_APIENTRY glWeightPointerOESContextANGLE(GLeglContext ctx, GLint size, GLenum type, GLsizei stride, const void *pointer);
-#endif
\ No newline at end of file
+#endif

scripts/run_code_generation.py

@@ -242,6 +242,8 @@ if any_dirty:
         args += ['git.bat']
     else:
         args += ['git']
-    args += ['cl', 'format']
+    # The diff can be so large the arguments to clang-format can break the Windows command
+    # line length limits. Work around this by calling git cl format with --full.
+    args += ['cl', 'format', '--full']
     print('Calling git cl format')
     subprocess.call(args)

src/libANGLE/gen_packed_gl_enums.py

@@ -100,7 +100,7 @@ enum class {enum_name} : uint8_t
     EnumCount = {max_value},
 }};
 
-template<>
+template <>
 {enum_name} From{api_enum_name}<{enum_name}>({api_enum_name} from);
 {api_enum_name} To{api_enum_name}({enum_name} from);
 """
@@ -155,22 +155,25 @@ namespace {namespace}
 """
 
 enum_implementation_template = """
-template<>
+template <>
 {enum_name} From{api_enum_name}<{enum_name}>({api_enum_name} from)
 {{
-    switch(from)
+    switch (from)
     {{
 {from_glenum_cases}
-        default: return {enum_name}::InvalidEnum;
+        default:
+            return {enum_name}::InvalidEnum;
     }}
 }}
 
 {api_enum_name} To{api_enum_name}({enum_name} from)
 {{
-    switch(from)
+    switch (from)
     {{
 {to_glenum_cases}
-        default: UNREACHABLE(); return 0;
+        default:
+            UNREACHABLE();
+            return 0;
     }}
 }}
 """
@@ -183,8 +186,8 @@ def write_cpp(enums, path_prefix, file_name, data_source_name, namespace, api_en
         to_glenum_cases = []
         for value in enum.values:
             qualified_name = enum.name + '::' + value.name
-            from_glenum_cases.append('        case ' + value.gl_name + ': return ' + qualified_name + ';')
-            to_glenum_cases.append('        case ' + qualified_name + ': return ' + value.gl_name + ';')
+            from_glenum_cases.append('        case ' + value.gl_name + ':\n            return ' + qualified_name + ';')
+            to_glenum_cases.append('        case ' + qualified_name + ':\n            return ' + value.gl_name + ';')
 
         content.append(enum_implementation_template.format(
             enum_name = enum.name,

src/libANGLE/renderer/gen_angle_format_table.py

@@ -233,11 +233,17 @@ def gen_enum_string(all_angle):
         enum_data += ',\n    ' + format_id
     return enum_data
 
+case_template = """        case {gl_format}:
+            return Format::ID::{angle_format};
+"""
+
 def gen_map_switch_string(gl_to_angle):
     switch_data = '';
     for gl_format in sorted(gl_to_angle.keys()):
         angle_format = gl_to_angle[gl_format]
-        switch_data += "        case " + gl_format + ":\nreturn Format::ID::" + angle_format + ";\n"
+        switch_data += case_template.format(
+            gl_format=gl_format,
+            angle_format=angle_format)
     switch_data += "        default:\n"
     switch_data += "            return Format::ID::NONE;"
     return switch_data;