Skip to content

Commit d4c417f

Browse files
committed
Merge branch 'main' into subgroup-uniformity
2 parents 9b555f9 + f6e9de7 commit d4c417f

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

webgpu.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,8 @@ typedef enum WGPUWGSLLanguageFeatureName {
12441244
WGPUWGSLLanguageFeatureName_PointerCompositeAccess = 0x00000004,
12451245
WGPUWGSLLanguageFeatureName_UniformBufferStandardLayout = 0x00000005,
12461246
WGPUWGSLLanguageFeatureName_SubgroupId = 0x00000006,
1247-
WGPUWGSLLanguageFeatureName_SubgroupUniformity = 0x00000007,
1247+
WGPUWGSLLanguageFeatureName_TextureAndSamplerLet = 0x00000007,
1248+
WGPUWGSLLanguageFeatureName_SubgroupUniformity = 0x00000008,
12481249
WGPUWGSLLanguageFeatureName_Force32 = 0x7FFFFFFF
12491250
} WGPUWGSLLanguageFeatureName WGPU_ENUM_ATTRIBUTE;
12501251

@@ -1361,6 +1362,7 @@ static const WGPUTextureUsage WGPUTextureUsage_CopyDst = 0x0000000000000002;
13611362
static const WGPUTextureUsage WGPUTextureUsage_TextureBinding = 0x0000000000000004;
13621363
static const WGPUTextureUsage WGPUTextureUsage_StorageBinding = 0x0000000000000008;
13631364
static const WGPUTextureUsage WGPUTextureUsage_RenderAttachment = 0x0000000000000010;
1365+
static const WGPUTextureUsage WGPUTextureUsage_TransientAttachment = 0x0000000000000020;
13641366

13651367
/** @} */
13661368

webgpu.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webgpu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,6 +1513,9 @@ enums:
15131513
- name: subgroup_id
15141514
doc: |
15151515
TODO
1516+
- name: texture_and_sampler_let
1517+
doc: |
1518+
TODO
15161519
- name: subgroup_uniformity
15171520
doc: |
15181521
TODO
@@ -1634,6 +1637,9 @@ bitflags:
16341637
- name: render_attachment
16351638
doc: |
16361639
TODO
1640+
- name: transient_attachment
1641+
doc: |
1642+
TODO
16371643
structs:
16381644
- name: adapter_info
16391645
doc: |

0 commit comments

Comments
 (0)