From 50824d5923fa5c51c28f5625495bcf852a2d3e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= Date: Sun, 19 Jan 2025 03:55:10 -0800 Subject: [PATCH] webgpu.h: Clean Dawn API to query FormatCapabilities Bug: 42241174 Change-Id: I9cfecde9802f681fb1e87903eff37f68818b5dde Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/222374 Reviewed-by: Corentin Wallez Commit-Queue: Fr Reviewed-by: Kai Ninomiya --- src/dawn/dawn.json | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json index 7c4f96e044..919771e28a 100644 --- a/src/dawn/dawn.json +++ b/src/dawn/dawn.json @@ -2227,10 +2227,8 @@ {"value": 23, "name": "adapter properties D3D", "tags": ["dawn"]}, {"value": 24, "name": "adapter properties vk", "tags": ["dawn"]}, {"value": 25, "name": "r8 unorm storage", "tags": ["dawn"]}, - {"value": 26, "name": "format capabilities", "enum_value_conflict": true, "tags": ["dawn", "deprecated"]}, - {"value": 26, "name": "dawn format capabilities", "enum_value_conflict": true, "tags": ["dawn"]}, - {"value": 27, "name": "drm format capabilities", "enum_value_conflict": true, "tags": ["dawn", "deprecated"]}, - {"value": 27, "name": "dawn drm format capabilities", "enum_value_conflict": true, "tags": ["dawn"]}, + {"value": 26, "name": "dawn format capabilities", "tags": ["dawn"]}, + {"value": 27, "name": "dawn drm format capabilities", "tags": ["dawn"]}, {"value": 28, "name": "norm16 texture formats", "tags": ["dawn"]}, {"value": 29, "name": "multi planar format nv16", "tags": ["dawn"]}, {"value": 30, "name": "multi planar format nv24", "tags": ["dawn"]}, @@ -2276,22 +2274,12 @@ "category": "native", "wasm type": "f" }, - "format capabilities": { - "tags": ["dawn", "deprecated"], - "category": "typedef", - "type": "dawn format capabilities" - }, "dawn format capabilities": { "category": "structure", "tags": ["dawn"], "extensible": "out", "members": [] }, - "drm format capabilities": { - "tags": ["dawn", "deprecated"], - "category": "typedef", - "type": "dawn drm format capabilities" - }, "dawn drm format capabilities": { "category": "structure", "tags": ["dawn"], @@ -2302,11 +2290,6 @@ {"name": "properties", "type": "dawn drm format properties", "annotation": "const*", "length": "properties count"} ] }, - "drm format properties": { - "tags": ["dawn", "deprecated"], - "category": "typedef", - "type": "dawn drm format properties" - }, "dawn drm format properties": { "category": "structure", "tags": ["dawn"], @@ -3693,8 +3676,7 @@ {"value": 22, "name": "adapter properties vk", "tags": ["dawn"]}, {"value": 23, "name": "dawn wire WGSL control", "tags": ["dawn"]}, {"value": 24, "name": "dawn WGSL blocklist", "tags": ["dawn", "native"]}, - {"value": 25, "name": "drm format capabilities", "enum_value_conflict": true, "tags": ["dawn", "deprecated"]}, - {"value": 25, "name": "dawn drm format capabilities", "enum_value_conflict": true, "tags": ["dawn"]}, + {"value": 25, "name": "dawn drm format capabilities", "tags": ["dawn"]}, {"value": 26, "name": "shader module compilation options", "tags": ["dawn"]}, {"value": 27, "name": "color target state expand resolve texture dawn", "tags": ["dawn"]}, {"value": 28, "name": "render pass descriptor expand resolve rect", "tags": ["dawn"]},