encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Shrek Shao 2022-02-08 20:21:40 +00:00 committed by Dawn LUCI CQ
parent 98d4a01bc1
commit ee50bc060a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dawn.json
View File

@ -790,7 +790,7 @@
}, },
{ {
"name": "begin pipeline statistics query", "name": "begin pipeline statistics query",
"tags": ["upstream"], "tags": ["upstream", "emscripten"],
"args": [ "args": [
{"name": "query set", "type": "query set"}, {"name": "query set", "type": "query set"},
{"name": "query index", "type": "uint32_t"} {"name": "query index", "type": "uint32_t"}
@ -820,7 +820,7 @@
}, },
{ {
"name": "end pipeline statistics query", "name": "end pipeline statistics query",
"tags": ["upstream"] "tags": ["upstream", "emscripten"]
}, },
{ {
"name": "set label", "name": "set label",
@ -1326,7 +1326,7 @@
"category": "enum", "category": "enum",
"values": [ "values": [
{"value": 0, "name": "undefined", "jsrepr": "undefined"}, {"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": 2, "name": "depth24 unorm stencil8"},
{"value": 3, "name": "depth32 float stencil8"}, {"value": 3, "name": "depth32 float stencil8"},
{"value": 4, "name": "timestamp query"}, {"value": 4, "name": "timestamp query"},
@ -1397,7 +1397,7 @@
}, },
{ {
"name": "process events", "name": "process events",
"tags": ["upstream"] "tags": ["upstream", "emscripten"]
}, },
{ {
"name": "request adapter", "name": "request adapter",
@ -1518,7 +1518,7 @@
"power preference": { "power preference": {
"category": "enum", "category": "enum",
"values": [ "values": [
{"value": 0, "name": "undefined"}, {"value": 0, "name": "undefined", "jsrepr": "undefined"},
{"value": 1, "name": "low power"}, {"value": 1, "name": "low power"},
{"value": 2, "name": "high performance"} {"value": 2, "name": "high performance"}
] ]
@ -1964,7 +1964,7 @@
}, },
{ {
"name": "begin pipeline statistics query", "name": "begin pipeline statistics query",
"tags": ["upstream"], "tags": ["upstream", "emscripten"],
"args": [ "args": [
{"name": "query set", "type": "query set"}, {"name": "query set", "type": "query set"},
{"name": "query index", "type": "uint32_t"} {"name": "query index", "type": "uint32_t"}
@ -1990,7 +1990,7 @@
}, },
{ {
"name": "end pipeline statistics query", "name": "end pipeline statistics query",
"tags": ["upstream"] "tags": ["upstream", "emscripten"]
}, },
{ {
"name": "set label", "name": "set label",
@ -2097,7 +2097,7 @@
"primitive depth clip control": { "primitive depth clip control": {
"category": "structure", "category": "structure",
"chained": "in", "chained": "in",
"tags": ["upstream"], "tags": ["upstream", "emscripten"],
"members": [ "members": [
{"name": "unclipped depth", "type": "bool", "default": "false"} {"name": "unclipped depth", "type": "bool", "default": "false"}
] ]
@ -2285,7 +2285,7 @@
{ {
"name": "get preferred format", "name": "get preferred format",
"returns": "texture format", "returns": "texture format",
"tags": ["upstream"], "tags": ["upstream", "emscripten"],
"args": [ "args": [
{"name": "adapter", "type": "adapter"} {"name": "adapter", "type": "adapter"}
] ]
@ -2389,7 +2389,7 @@
{"value": 4, "name": "surface descriptor from canvas HTML selector"}, {"value": 4, "name": "surface descriptor from canvas HTML selector"},
{"value": 5, "name": "shader module SPIRV descriptor"}, {"value": 5, "name": "shader module SPIRV descriptor"},
{"value": 6, "name": "shader module WGSL 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": 8, "name": "surface descriptor from windows core window", "tags": ["dawn"]},
{"value": 9, "name": "external texture binding entry", "tags": ["dawn"]}, {"value": 9, "name": "external texture binding entry", "tags": ["dawn"]},
{"value": 10, "name": "external texture binding layout", "tags": ["dawn"]}, {"value": 10, "name": "external texture binding layout", "tags": ["dawn"]},

4
generator/dawn_json_generator.py
View File

@ -849,8 +849,8 @@ class MultiGeneratorFromDawnJSON(Generator):
[RENDER_PARAMS_BASE, params_upstream])) [RENDER_PARAMS_BASE, params_upstream]))
if 'emscripten_bits' in targets: if 'emscripten_bits' in targets:
params_emscripten = parse_json( params_emscripten = parse_json(loaded_json,
loaded_json, enabled_tags=['upstream', 'emscripten']) enabled_tags=['emscripten'])
renders.append( renders.append(
FileRender('api.h', 'emscripten-bits/' + api + '.h', FileRender('api.h', 'emscripten-bits/' + api + '.h',
[RENDER_PARAMS_BASE, params_emscripten])) [RENDER_PARAMS_BASE, params_emscripten]))