dawn.json changes for the upstream webgpu.h
- Fix power preference undefined value
- Remove 'upstream' tagged content from emscripten-bits generation
explicitly tag 'emscripten' to things still needed
Bug: None
Change-Id: If575823ff1d99237d7c2cb0e784c24a7299b4a31
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79220
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>
diff --git a/dawn.json b/dawn.json
index 1ba4a24..bc757a2 100644
--- a/dawn.json
+++ b/dawn.json
@@ -790,7 +790,7 @@
},
{
"name": "begin pipeline statistics query",
- "tags": ["upstream"],
+ "tags": ["upstream", "emscripten"],
"args": [
{"name": "query set", "type": "query set"},
{"name": "query index", "type": "uint32_t"}
@@ -820,7 +820,7 @@
},
{
"name": "end pipeline statistics query",
- "tags": ["upstream"]
+ "tags": ["upstream", "emscripten"]
},
{
"name": "set label",
@@ -1326,7 +1326,7 @@
"category": "enum",
"values": [
{"value": 0, "name": "undefined", "jsrepr": "undefined"},
- {"value": 1, "name": "depth clip control", "tags": ["upstream"]},
+ {"value": 1, "name": "depth clip control", "tags": ["upstream", "emscripten"]},
{"value": 2, "name": "depth24 unorm stencil8"},
{"value": 3, "name": "depth32 float stencil8"},
{"value": 4, "name": "timestamp query"},
@@ -1397,7 +1397,7 @@
},
{
"name": "process events",
- "tags": ["upstream"]
+ "tags": ["upstream", "emscripten"]
},
{
"name": "request adapter",
@@ -1518,7 +1518,7 @@
"power preference": {
"category": "enum",
"values": [
- {"value": 0, "name": "undefined"},
+ {"value": 0, "name": "undefined", "jsrepr": "undefined"},
{"value": 1, "name": "low power"},
{"value": 2, "name": "high performance"}
]
@@ -1964,7 +1964,7 @@
},
{
"name": "begin pipeline statistics query",
- "tags": ["upstream"],
+ "tags": ["upstream", "emscripten"],
"args": [
{"name": "query set", "type": "query set"},
{"name": "query index", "type": "uint32_t"}
@@ -1990,7 +1990,7 @@
},
{
"name": "end pipeline statistics query",
- "tags": ["upstream"]
+ "tags": ["upstream", "emscripten"]
},
{
"name": "set label",
@@ -2097,7 +2097,7 @@
"primitive depth clip control": {
"category": "structure",
"chained": "in",
- "tags": ["upstream"],
+ "tags": ["upstream", "emscripten"],
"members": [
{"name": "unclipped depth", "type": "bool", "default": "false"}
]
@@ -2285,7 +2285,7 @@
{
"name": "get preferred format",
"returns": "texture format",
- "tags": ["upstream"],
+ "tags": ["upstream", "emscripten"],
"args": [
{"name": "adapter", "type": "adapter"}
]
@@ -2389,7 +2389,7 @@
{"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", "tags": ["upstream"]},
+ {"value": 7, "name": "primitive depth clip control", "tags": ["upstream", "emscripten"]},
{"value": 8, "name": "surface descriptor from windows core window", "tags": ["dawn"]},
{"value": 9, "name": "external texture binding entry", "tags": ["dawn"]},
{"value": 10, "name": "external texture binding layout", "tags": ["dawn"]},
diff --git a/generator/dawn_json_generator.py b/generator/dawn_json_generator.py
index 36e6ec6..5ca66e1 100644
--- a/generator/dawn_json_generator.py
+++ b/generator/dawn_json_generator.py
@@ -849,8 +849,8 @@
[RENDER_PARAMS_BASE, params_upstream]))
if 'emscripten_bits' in targets:
- params_emscripten = parse_json(
- loaded_json, enabled_tags=['upstream', 'emscripten'])
+ params_emscripten = parse_json(loaded_json,
+ enabled_tags=['emscripten'])
renders.append(
FileRender('api.h', 'emscripten-bits/' + api + '.h',
[RENDER_PARAMS_BASE, params_emscripten]))
