Re-number enum values part 2

- Makes enum values within an implementation-specific range packed
  at the front.
- Tag emscripten-specific enum values.
- Generate Dawn webgpu{_cpp}.h headers with all tags enabled except
  "upstream". This means we generate Emscripten-only things inside
  the header as well so the header can be used for either native
  or web. In native, Dawn would report these features as not
  supported. Currently the only such feature was the surface descriptor
  for HTML canvas element. Previously, it was specified in dawn.json
  without the "emscripten" tag, so Dawn headers already included
  it.
- Remove the emscripten-only onSubmittedWorkDone function. This is
  necessary to avoid a function type conflict with the new function.
  The Emscripten signature was already changed in
  emscripten-core/emscripten#21299
- Update dawn native format utils to handle unknown enums. The header
  has all the enums in it, but Dawn native doesn't know the Emscripten
  enums.

Fixed: 42241083
Change-Id: I4774053d1718ad6302ce2e4302ad8690787c10e6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/196174
Reviewed-by: Loko Kung <[email protected]>
Reviewed-by: Kai Ninomiya <[email protected]>
Commit-Queue: Austin Eng <[email protected]>

Author: austinEng

generator/dawn_json_generator.py

@@ -94,7 +94,6 @@ def js_enum_case(self):
             result += chunk.lower()
         return result
 
-
 def concat_names(*names):
     return ' '.join([name.canonical_case() for name in names])
 
@@ -1204,6 +1203,13 @@ def get_file_renders(self, args):
         params_dawn = parse_json(
             loaded_json,
             enabled_tags=['compat', 'dawn', 'native', 'deprecated'])
+
+        params_all = parse_json(loaded_json,
+                                enabled_tags=[
+                                    'compat', 'dawn', 'emscripten', 'native',
+                                    'deprecated'
+                                ])
+
         metadata = params_dawn['metadata']
         RENDER_PARAMS_BASE = make_base_render_params(metadata)
 
@@ -1212,7 +1218,7 @@ def get_file_renders(self, args):
         if 'headers' in targets:
             renders.append(
                 FileRender('api.h', 'include/dawn/' + api + '.h',
-                           [RENDER_PARAMS_BASE, params_dawn]))
+                           [RENDER_PARAMS_BASE, params_all]))
             renders.append(
                 FileRender('dawn/wire/client/api.h',
                            'include/dawn/wire/client/' + api + '.h',
@@ -1225,7 +1231,7 @@ def get_file_renders(self, args):
         if 'cpp_headers' in targets:
             renders.append(
                 FileRender('api_cpp.h', 'include/dawn/' + api + '_cpp.h', [
-                    RENDER_PARAMS_BASE, params_dawn, {
+                    RENDER_PARAMS_BASE, params_all, {
                         'c_header': api + '/' + api + '.h',
                         'c_namespace': None,
                     }

generator/templates/dawn/native/api_absl_format.cpp

@@ -89,12 +89,13 @@ namespace {{namespace}} {
             {% for value in type.values %}
                 case {{as_cppType(type.name)}}::{{as_cppEnum(value.name)}}:
                     s->Append("{{as_cppEnum(value.name)}}");
-                    break;
+                    return {true};
             {% endfor %}
+            default:
+                break;
             }
-        } else {
-            s->Append(absl::StrFormat("%u", static_cast<typename std::underlying_type<{{as_cppType(type.name)}}>::type>(value)));
         }
+        s->Append(absl::StrFormat("%u", static_cast<typename std::underlying_type<{{as_cppType(type.name)}}>::type>(value)));
         return {true};
     }
     {% endfor %}

src/dawn/dawn.json

@@ -2919,15 +2919,6 @@
                     {"name": "commands", "type": "command buffer", "annotation": "const*", "length": "command count"}
                 ]
             },
-            {
-                "name": "on submitted work done",
-                "tags": ["emscripten"],
-                "args": [
-                    {"name": "signal value", "type": "uint64_t"},
-                    {"name": "callback", "type": "queue work done callback"},
-                    {"name": "userdata", "type": "void *"}
-                ]
-            },
             {
                 "name": "on submitted work done",
                 "tags": ["dawn", "upstream"],
@@ -3851,6 +3842,7 @@
         "category": "structure",
         "chained": "in",
         "chain roots": ["surface descriptor"],
+        "tags": ["emscripten"],
         "members": [
             {"name": "selector", "type": "char", "annotation": "const*", "length": "strlen"}
         ]
@@ -3878,7 +3870,7 @@
         "category": "structure",
         "chained": "in",
         "chain roots": ["surface descriptor"],
-        "tags": ["upstream"],
+        "tags": ["native"],
         "members": [
             {"name": "connection", "type": "void", "annotation": "*"},
             {"name": "window", "type": "uint32_t"}
@@ -3956,20 +3948,22 @@
         "category": "enum",
         "emscripten_no_enum_table": true,
         "values": [
-            {"value": 1, "name": "surface descriptor from metal layer", "tags": ["native"]},
-            {"value": 2, "name": "surface descriptor from windows HWND", "tags": ["native"]},
-            {"value": 3, "name": "surface descriptor from xlib window", "tags": ["native"]},
-            {"value": 4, "name": "surface descriptor from canvas HTML selector"},
-            {"value": 5, "name": "shader module SPIRV descriptor"},
-            {"value": 6, "name": "shader module WGSL descriptor"},
-            {"value": 7, "name": "primitive depth clip control"},
-            {"value": 8, "name": "surface descriptor from wayland surface", "tags": ["native"]},
-            {"value": 9, "name": "surface descriptor from android native window", "tags": ["native"]},
-            {"value": 10, "name": "surface descriptor from xcb window", "tags": ["upstream"]},
-            {"value": 11, "name": "render pass descriptor max draw count"},
+            {"value": 1, "name": "shader module SPIRV descriptor"},
+            {"value": 2, "name": "shader module WGSL descriptor"},
+            {"value": 3, "name": "primitive depth clip control"},
+            {"value": 4, "name": "render pass descriptor max draw count"},
 
             {"value": 0, "name": "texture binding view dimension descriptor", "tags": ["compat"]},
 
+            {"value": 0, "name": "surface descriptor from canvas HTML selector", "tags": ["emscripten"]},
+
+            {"value": 0, "name": "surface descriptor from metal layer", "tags": ["native"]},
+            {"value": 1, "name": "surface descriptor from windows HWND", "tags": ["native"]},
+            {"value": 2, "name": "surface descriptor from xlib window", "tags": ["native"]},
+            {"value": 3, "name": "surface descriptor from wayland surface", "tags": ["native"]},
+            {"value": 4, "name": "surface descriptor from android native window", "tags": ["native"]},
+            {"value": 5, "name": "surface descriptor from xcb window", "tags": ["native"]},
+
             {"value": 0, "name": "surface descriptor from windows core window", "tags": ["dawn"]},
             {"value": 1, "name": "external texture binding entry", "tags": ["dawn"]},
             {"value": 2, "name": "external texture binding layout", "tags": ["dawn"]},

tools/android/BUILD.gn

@@ -181,7 +181,6 @@ dawn_json_generator("kotlin_gen") {
     "java/android/dawn/SurfaceConfiguration.kt",
     "java/android/dawn/SurfaceDescriptor.kt",
     "java/android/dawn/SurfaceDescriptorFromAndroidNativeWindow.kt",
-    "java/android/dawn/SurfaceDescriptorFromCanvasHTMLSelector.kt",
     "java/android/dawn/SurfaceGetCurrentTextureStatus.kt",
     "java/android/dawn/SurfaceTexture.kt",
     "java/android/dawn/SwapChain.kt",