Skip to content

Commit

Permalink
[webgpu-headers] Clean depthWriteEnabled WGPUOptionalBool leftover
Browse files Browse the repository at this point in the history 
The following CLs must be merged before:
- https://chromium-review.googlesource.com/c/chromium/src/+/5687273/
- https://skia-review.googlesource.com/c/skia/+/874556

webgpu-native/webgpu-headers#308

Bug: 42241167
Change-Id: I79a827fc279ab25bff1d59a9b75771ff17887f84
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/197335
Reviewed-by: Corentin Wallez <[email protected]>
Commit-Queue: Fr <[email protected]>
  • Loading branch information
@beaufortfrancois
beaufortfrancois authored and Dawn LUCI CQ committed Aug 28, 2024
1 parent d90557b commit 6931e72
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 66 deletions.
1 change: 0 additions & 1 deletion generator/templates/api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
#endif

#define WGPU_BREAKING_CHANGE_DEPTH_CLIP_CONTROL
#define WGPU_BREAKING_CHANGE_DEPTH_WRITE_ENABLED

#include <stdint.h>
#include <stddef.h>
Expand Down
119 changes: 54 additions & 65 deletions src/dawn/dawn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3830,16 +3830,6 @@
]
},

"depth stencil state depth write defined dawn": {
"tags": ["dawn"],
"category": "structure",
"chained": "in",
"chain roots": ["depth stencil state"],
"members": [
{"name": "depth write defined", "type": "bool"}
]
},

"multisample state": {
"category": "structure",
"extensible": "in",
Expand Down Expand Up @@ -4275,62 +4265,61 @@
{"value": 1, "name": "external texture binding entry", "tags": ["dawn"]},
{"value": 2, "name": "external texture binding layout", "tags": ["dawn"]},
{"value": 3, "name": "surface descriptor from windows swap chain panel", "tags": ["dawn"]},
{"value": 4, "name": "depth stencil state depth write defined dawn", "tags": ["dawn"]},
{"value": 5, "name": "dawn texture internal usage descriptor", "tags": ["dawn"]},
{"value": 6, "name": "dawn encoder internal usage descriptor", "tags": ["dawn"]},
{"value": 7, "name": "dawn instance descriptor", "tags": ["dawn", "native"]},
{"value": 8, "name": "dawn cache device descriptor", "tags": ["dawn", "native"]},
{"value": 9, "name": "dawn adapter properties power preference", "tags": ["dawn", "native"]},
{"value": 10, "name": "dawn buffer descriptor error info from wire client", "tags": ["dawn"]},
{"value": 11, "name": "dawn toggles descriptor", "tags": ["dawn", "native"]},
{"value": 12, "name": "dawn shader module SPIRV options descriptor", "tags": ["dawn"]},
{"value": 13, "name": "request adapter options LUID", "tags": ["dawn", "native"]},
{"value": 14, "name": "request adapter options get GL proc", "tags": ["dawn", "native"]},
{"value": 15, "name": "request adapter options D3D11 device", "tags": ["dawn", "native"]},
{"value": 16, "name": "dawn render pass color attachment render to single sampled", "tags": ["dawn"]},
{"value": 17, "name": "render pass pixel local storage", "tags": ["dawn"]},
{"value": 18, "name": "pipeline layout pixel local storage", "tags": ["dawn"]},
{"value": 19, "name": "buffer host mapped pointer", "tags": ["dawn"]},
{"value": 20, "name": "dawn experimental subgroup limits", "tags": ["dawn"]},
{"value": 21, "name": "adapter properties memory heaps", "tags": ["dawn"]},
{"value": 22, "name": "adapter properties D3D", "tags": ["dawn"]},
{"value": 23, "name": "adapter properties vk", "tags": ["dawn"]},
{"value": 24, "name": "dawn compute pipeline full subgroups", "tags": ["dawn"]},
{"value": 25, "name": "dawn wire WGSL control", "tags": ["dawn"]},
{"value": 26, "name": "dawn WGSL blocklist", "tags": ["dawn", "native"]},
{"value": 27, "name": "drm format capabilities", "tags": ["dawn"]},
{"value": 28, "name": "shader module compilation options", "tags": ["dawn"]},
{"value": 29, "name": "color target state expand resolve texture dawn", "tags": ["dawn"]},
{"value": 4, "name": "dawn texture internal usage descriptor", "tags": ["dawn"]},
{"value": 5, "name": "dawn encoder internal usage descriptor", "tags": ["dawn"]},
{"value": 6, "name": "dawn instance descriptor", "tags": ["dawn", "native"]},
{"value": 7, "name": "dawn cache device descriptor", "tags": ["dawn", "native"]},
{"value": 8, "name": "dawn adapter properties power preference", "tags": ["dawn", "native"]},
{"value": 9, "name": "dawn buffer descriptor error info from wire client", "tags": ["dawn"]},
{"value": 10, "name": "dawn toggles descriptor", "tags": ["dawn", "native"]},
{"value": 11, "name": "dawn shader module SPIRV options descriptor", "tags": ["dawn"]},
{"value": 12, "name": "request adapter options LUID", "tags": ["dawn", "native"]},
{"value": 13, "name": "request adapter options get GL proc", "tags": ["dawn", "native"]},
{"value": 14, "name": "request adapter options D3D11 device", "tags": ["dawn", "native"]},
{"value": 15, "name": "dawn render pass color attachment render to single sampled", "tags": ["dawn"]},
{"value": 16, "name": "render pass pixel local storage", "tags": ["dawn"]},
{"value": 17, "name": "pipeline layout pixel local storage", "tags": ["dawn"]},
{"value": 18, "name": "buffer host mapped pointer", "tags": ["dawn"]},
{"value": 19, "name": "dawn experimental subgroup limits", "tags": ["dawn"]},
{"value": 20, "name": "adapter properties memory heaps", "tags": ["dawn"]},
{"value": 21, "name": "adapter properties D3D", "tags": ["dawn"]},
{"value": 22, "name": "adapter properties vk", "tags": ["dawn"]},
{"value": 23, "name": "dawn compute pipeline full subgroups", "tags": ["dawn"]},
{"value": 24, "name": "dawn wire WGSL control", "tags": ["dawn"]},
{"value": 25, "name": "dawn WGSL blocklist", "tags": ["dawn", "native"]},
{"value": 26, "name": "drm format capabilities", "tags": ["dawn"]},
{"value": 27, "name": "shader module compilation options", "tags": ["dawn"]},
{"value": 28, "name": "color target state expand resolve texture dawn", "tags": ["dawn"]},

{"value": 30, "name": "shared texture memory vk dedicated allocation descriptor", "tags": ["dawn", "native"]},
{"value": 31, "name": "shared texture memory a hardware buffer descriptor", "tags": ["dawn", "native"]},
{"value": 32, "name": "shared texture memory dma buf descriptor", "tags": ["dawn", "native"]},
{"value": 33, "name": "shared texture memory opaque FD descriptor", "tags": ["dawn", "native"]},
{"value": 34, "name": "shared texture memory zircon handle descriptor", "tags": ["dawn", "native"]},
{"value": 35, "name": "shared texture memory DXGI shared handle descriptor", "tags": ["dawn", "native"]},
{"value": 36, "name": "shared texture memory D3D11 texture 2D descriptor", "tags": ["dawn", "native"]},
{"value": 37, "name": "shared texture memory IO surface descriptor", "tags": ["dawn", "native"]},
{"value": 38, "name": "shared texture memory EGL image descriptor", "tags": ["dawn", "native"]},
{"value": 39, "name": "shared texture memory initialized begin state", "tags": ["dawn", "native"]},
{"value": 40, "name": "shared texture memory initialized end state", "tags": ["dawn", "native"]},
{"value": 41, "name": "shared texture memory vk image layout begin state", "tags": ["dawn", "native"]},
{"value": 42, "name": "shared texture memory vk image layout end state", "tags": ["dawn", "native"]},
{"value": 43, "name": "shared texture memory D3D swapchain begin state", "tags": ["dawn", "native"]},
{"value": 44, "name": "shared fence vk semaphore opaque FD descriptor", "tags": ["dawn", "native"]},
{"value": 45, "name": "shared fence vk semaphore opaque FD export info", "tags": ["dawn", "native"]},
{"value": 46, "name": "shared fence vk semaphore sync FD descriptor", "tags": ["dawn", "native"]},
{"value": 47, "name": "shared fence vk semaphore sync FD export info", "tags": ["dawn", "native"]},
{"value": 48, "name": "shared fence vk semaphore zircon handle descriptor", "tags": ["dawn", "native"]},
{"value": 49, "name": "shared fence vk semaphore zircon handle export info", "tags": ["dawn", "native"]},
{"value": 50, "name": "shared fence DXGI shared handle descriptor", "tags": ["dawn", "native"]},
{"value": 51, "name": "shared fence DXGI shared handle export info", "tags": ["dawn", "native"]},
{"value": 52, "name": "shared fence MTL shared event descriptor", "tags": ["dawn", "native"]},
{"value": 53, "name": "shared fence MTL shared event export info", "tags": ["dawn", "native"]},
{"value": 54, "name": "shared buffer memory D3D12 resource descriptor", "tags": ["dawn", "native"]},
{"value": 55, "name": "static sampler binding layout", "tags": ["dawn"]},
{"value": 56, "name": "y cb cr vk descriptor", "tags": ["dawn"]},
{"value": 57, "name": "shared texture memory a hardware buffer properties", "tags": ["dawn", "native"]},
{"value": 58, "name": "a hardware buffer properties", "tags": ["dawn", "native"]}
{"value": 29, "name": "shared texture memory vk dedicated allocation descriptor", "tags": ["dawn", "native"]},
{"value": 30, "name": "shared texture memory a hardware buffer descriptor", "tags": ["dawn", "native"]},
{"value": 31, "name": "shared texture memory dma buf descriptor", "tags": ["dawn", "native"]},
{"value": 32, "name": "shared texture memory opaque FD descriptor", "tags": ["dawn", "native"]},
{"value": 33, "name": "shared texture memory zircon handle descriptor", "tags": ["dawn", "native"]},
{"value": 34, "name": "shared texture memory DXGI shared handle descriptor", "tags": ["dawn", "native"]},
{"value": 35, "name": "shared texture memory D3D11 texture 2D descriptor", "tags": ["dawn", "native"]},
{"value": 36, "name": "shared texture memory IO surface descriptor", "tags": ["dawn", "native"]},
{"value": 37, "name": "shared texture memory EGL image descriptor", "tags": ["dawn", "native"]},
{"value": 38, "name": "shared texture memory initialized begin state", "tags": ["dawn", "native"]},
{"value": 39, "name": "shared texture memory initialized end state", "tags": ["dawn", "native"]},
{"value": 40, "name": "shared texture memory vk image layout begin state", "tags": ["dawn", "native"]},
{"value": 41, "name": "shared texture memory vk image layout end state", "tags": ["dawn", "native"]},
{"value": 42, "name": "shared texture memory D3D swapchain begin state", "tags": ["dawn", "native"]},
{"value": 43, "name": "shared fence vk semaphore opaque FD descriptor", "tags": ["dawn", "native"]},
{"value": 44, "name": "shared fence vk semaphore opaque FD export info", "tags": ["dawn", "native"]},
{"value": 45, "name": "shared fence vk semaphore sync FD descriptor", "tags": ["dawn", "native"]},
{"value": 46, "name": "shared fence vk semaphore sync FD export info", "tags": ["dawn", "native"]},
{"value": 47, "name": "shared fence vk semaphore zircon handle descriptor", "tags": ["dawn", "native"]},
{"value": 48, "name": "shared fence vk semaphore zircon handle export info", "tags": ["dawn", "native"]},
{"value": 49, "name": "shared fence DXGI shared handle descriptor", "tags": ["dawn", "native"]},
{"value": 50, "name": "shared fence DXGI shared handle export info", "tags": ["dawn", "native"]},
{"value": 51, "name": "shared fence MTL shared event descriptor", "tags": ["dawn", "native"]},
{"value": 52, "name": "shared fence MTL shared event export info", "tags": ["dawn", "native"]},
{"value": 53, "name": "shared buffer memory D3D12 resource descriptor", "tags": ["dawn", "native"]},
{"value": 54, "name": "static sampler binding layout", "tags": ["dawn"]},
{"value": 55, "name": "y cb cr vk descriptor", "tags": ["dawn"]},
{"value": 56, "name": "shared texture memory a hardware buffer properties", "tags": ["dawn", "native"]},
{"value": 57, "name": "a hardware buffer properties", "tags": ["dawn", "native"]}
]
},
"texture": {
Expand Down

0 comments on commit 6931e72

Please sign in to comment.