commit 493de1e024573f38b0d4b0df34d56104b45a9983
author Austin Eng <enga@chromium.org> Tue Jun 20 22:58:27 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 20 22:58:27 2023 +0000
tree c738108cc302c61d10222288eaa5812aba523a38
parent acd91ecc509ddeddcda49d9166366cdff5f134d3

Make RequestAdapterOptionsBackendType part of RequestAdapterOptions

Removes the chained struct and adds it as a member to RequestAdapterOptions

PR: https://github.com/webgpu-native/webgpu-headers/pull/195

Bug: dawn:1875
Change-Id: I8693bab697292ef1dd832356913e1d23d985990e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/138160
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index 81e98ca..a975648 100644
--- a/dawn.json
+++ b/dawn.json
@@ -53,19 +53,11 @@
         "members": [
             {"name": "compatible surface", "type": "surface", "optional": true},
             {"name": "power preference", "type": "power preference", "default": "undefined"},
+            {"name": "backend type", "type": "backend type", "default": "undefined"},
             {"name": "force fallback adapter", "type": "bool", "default": "false"},
             {"name": "compatibility mode", "type": "bool", "default": "false", "tags": ["dawn", "emscripten"]}
         ]
     },
-    "request adapter options backend type": {
-        "tags": ["dawn"],
-        "category": "structure",
-        "chained": "in",
-        "chain roots": ["request adapter options"],
-        "members": [
-            {"name": "backend type", "type": "backend type"}
-        ]
-    },
     "request adapter status": {
         "category": "enum",
         "emscripten_no_enum_table": true,
@@ -210,14 +202,15 @@
         "category": "enum",
         "emscripten_no_enum_table": true,
         "values": [
-            {"value": 0, "name": "null"},
-            {"value": 1, "name": "WebGPU"},
-            {"value": 2, "name": "D3D11"},
-            {"value": 3, "name": "D3D12"},
-            {"value": 4, "name": "metal"},
-            {"value": 5, "name": "vulkan"},
-            {"value": 6, "name": "openGL"},
-            {"value": 7, "name": "openGLES"}
+            {"value": 0, "name": "undefined", "jsrepr": "undefined", "valid": false},
+            {"value": 1, "name": "null"},
+            {"value": 2, "name": "WebGPU"},
+            {"value": 3, "name": "D3D11"},
+            {"value": 4, "name": "D3D12"},
+            {"value": 5, "name": "metal"},
+            {"value": 6, "name": "vulkan"},
+            {"value": 7, "name": "openGL"},
+            {"value": 8, "name": "openGLES"}
         ]
     },
     "bind group": {
@@ -2628,9 +2621,8 @@
             {"value": 1007, "name": "dawn buffer descriptor error info from wire client", "tags": ["dawn"]},
             {"value": 1008, "name": "dawn toggles descriptor", "tags": ["dawn", "native"]},
             {"value": 1009, "name": "dawn shader module SPIRV options descriptor", "tags": ["dawn"]},
-            {"value": 1010, "name": "request adapter options backend type", "tags": ["dawn"]},
-            {"value": 1011, "name": "request adapter options LUID", "tags": ["dawn", "native"]},
-            {"value": 1012, "name": "request adapter options get GL proc", "tags": ["dawn", "native"]}
+            {"value": 1010, "name": "request adapter options LUID", "tags": ["dawn", "native"]},
+            {"value": 1011, "name": "request adapter options get GL proc", "tags": ["dawn", "native"]}
         ]
     },
     "texture": {