Fix linking of TextureViewSwizzle to TextureViewDescriptor.

"extends" shouldn't have the "struct." prefix.

Adds a check in the validator to check that the linking works correctly.

Author: Kangz

gen/validator.go

@@ -135,6 +135,16 @@ func mergeAndValidateDuplicates(yamlPaths []string) (errs error) {
 				objects[o.Name] = o
 			}
 		}
+
+		for _, s := range structs {
+			if s.Type == "extension" {
+				for _, extend := range s.Extends {
+					if _, exists := structs[extend]; !exists {
+						errs = errors.Join(errs, fmt.Errorf("merge: struct.%s extends struct.%s that's not found (listed extends should not have the 'struct.' prefix)", s.Name, extend))
+					}
+				}
+			}
+		}
 	}
 	return
 }

tests/compile/init_tests_autogen.inl

@@ -59,7 +59,6 @@
 { WGPUTextureBindingLayout x = WGPU_TEXTURE_BINDING_LAYOUT_INIT; }
 { WGPUTextureBindingViewDimension x = WGPU_TEXTURE_BINDING_VIEW_DIMENSION_INIT; }
 { WGPUTextureComponentSwizzle x = WGPU_TEXTURE_COMPONENT_SWIZZLE_INIT; }
-{ WGPUTextureViewDescriptor x = WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT; }
 { WGPUVertexAttribute x = WGPU_VERTEX_ATTRIBUTE_INIT; }
 { WGPUBindGroupEntry x = WGPU_BIND_GROUP_ENTRY_INIT; }
 { WGPUBindGroupLayoutEntry x = WGPU_BIND_GROUP_LAYOUT_ENTRY_INIT; }
@@ -86,6 +85,7 @@
 { WGPUComputePipelineDescriptor x = WGPU_COMPUTE_PIPELINE_DESCRIPTOR_INIT; }
 { WGPUDeviceDescriptor x = WGPU_DEVICE_DESCRIPTOR_INIT; }
 { WGPURenderPassDescriptor x = WGPU_RENDER_PASS_DESCRIPTOR_INIT; }
+{ WGPUTextureViewDescriptor x = WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT; }
 { WGPUVertexState x = WGPU_VERTEX_STATE_INIT; }
 { WGPUFragmentState x = WGPU_FRAGMENT_STATE_INIT; }
 { WGPURenderPipelineDescriptor x = WGPU_RENDER_PIPELINE_DESCRIPTOR_INIT; }

webgpu.h

@@ -303,7 +303,6 @@ struct WGPUTexelCopyBufferLayout;
 struct WGPUTextureBindingLayout;
 struct WGPUTextureBindingViewDimension;
 struct WGPUTextureComponentSwizzle;
-struct WGPUTextureViewDescriptor;
 struct WGPUVertexAttribute;
 struct WGPUBindGroupEntry;
 struct WGPUBindGroupLayoutEntry;
@@ -330,6 +329,7 @@ struct WGPUColorTargetState;
 struct WGPUComputePipelineDescriptor;
 struct WGPUDeviceDescriptor;
 struct WGPURenderPassDescriptor;
+struct WGPUTextureViewDescriptor;
 struct WGPUVertexState;
 struct WGPUFragmentState;
 struct WGPURenderPipelineDescriptor;
@@ -3528,70 +3528,6 @@ typedef struct WGPUTextureComponentSwizzle {
     /*.a=*/WGPUComponentSwizzle_Undefined _wgpu_COMMA \
 })
 
-/**
- * Default values can be set using @ref WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT as initializer.
- */
-typedef struct WGPUTextureViewDescriptor {
-    WGPUChainedStruct * nextInChain;
-    /**
-     * This is a \ref NonNullInputString.
-     *
-     * The `INIT` macro sets this to @ref WGPU_STRING_VIEW_INIT.
-     */
-    WGPUStringView label;
-    /**
-     * The `INIT` macro sets this to @ref WGPUTextureFormat_Undefined.
-     */
-    WGPUTextureFormat format;
-    /**
-     * The `INIT` macro sets this to @ref WGPUTextureViewDimension_Undefined.
-     */
-    WGPUTextureViewDimension dimension;
-    /**
-     * The `INIT` macro sets this to `0`.
-     */
-    uint32_t baseMipLevel;
-    /**
-     * The `INIT` macro sets this to @ref WGPU_MIP_LEVEL_COUNT_UNDEFINED.
-     */
-    uint32_t mipLevelCount;
-    /**
-     * The `INIT` macro sets this to `0`.
-     */
-    uint32_t baseArrayLayer;
-    /**
-     * The `INIT` macro sets this to @ref WGPU_ARRAY_LAYER_COUNT_UNDEFINED.
-     */
-    uint32_t arrayLayerCount;
-    /**
-     * If set to @ref WGPUTextureAspect_Undefined,
-     * [defaults](@ref SentinelValues) to @ref WGPUTextureAspect_All.
-     *
-     * The `INIT` macro sets this to @ref WGPUTextureAspect_Undefined.
-     */
-    WGPUTextureAspect aspect;
-    /**
-     * The `INIT` macro sets this to @ref WGPUTextureUsage_None.
-     */
-    WGPUTextureUsage usage;
-} WGPUTextureViewDescriptor WGPU_STRUCTURE_ATTRIBUTE;
-
-/**
- * Initializer for @ref WGPUTextureViewDescriptor.
- */
-#define WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT _wgpu_MAKE_INIT_STRUCT(WGPUTextureViewDescriptor, { \
-    /*.nextInChain=*/NULL _wgpu_COMMA \
-    /*.label=*/WGPU_STRING_VIEW_INIT _wgpu_COMMA \
-    /*.format=*/WGPUTextureFormat_Undefined _wgpu_COMMA \
-    /*.dimension=*/WGPUTextureViewDimension_Undefined _wgpu_COMMA \
-    /*.baseMipLevel=*/0 _wgpu_COMMA \
-    /*.mipLevelCount=*/WGPU_MIP_LEVEL_COUNT_UNDEFINED _wgpu_COMMA \
-    /*.baseArrayLayer=*/0 _wgpu_COMMA \
-    /*.arrayLayerCount=*/WGPU_ARRAY_LAYER_COUNT_UNDEFINED _wgpu_COMMA \
-    /*.aspect=*/WGPUTextureAspect_Undefined _wgpu_COMMA \
-    /*.usage=*/WGPUTextureUsage_None _wgpu_COMMA \
-})
-
 /**
  * Default values can be set using @ref WGPU_VERTEX_ATTRIBUTE_INIT as initializer.
  */
@@ -4721,6 +4657,70 @@ typedef struct WGPURenderPassDescriptor {
     /*.timestampWrites=*/NULL _wgpu_COMMA \
 })
 
+/**
+ * Default values can be set using @ref WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT as initializer.
+ */
+typedef struct WGPUTextureViewDescriptor {
+    WGPUChainedStruct * nextInChain;
+    /**
+     * This is a \ref NonNullInputString.
+     *
+     * The `INIT` macro sets this to @ref WGPU_STRING_VIEW_INIT.
+     */
+    WGPUStringView label;
+    /**
+     * The `INIT` macro sets this to @ref WGPUTextureFormat_Undefined.
+     */
+    WGPUTextureFormat format;
+    /**
+     * The `INIT` macro sets this to @ref WGPUTextureViewDimension_Undefined.
+     */
+    WGPUTextureViewDimension dimension;
+    /**
+     * The `INIT` macro sets this to `0`.
+     */
+    uint32_t baseMipLevel;
+    /**
+     * The `INIT` macro sets this to @ref WGPU_MIP_LEVEL_COUNT_UNDEFINED.
+     */
+    uint32_t mipLevelCount;
+    /**
+     * The `INIT` macro sets this to `0`.
+     */
+    uint32_t baseArrayLayer;
+    /**
+     * The `INIT` macro sets this to @ref WGPU_ARRAY_LAYER_COUNT_UNDEFINED.
+     */
+    uint32_t arrayLayerCount;
+    /**
+     * If set to @ref WGPUTextureAspect_Undefined,
+     * [defaults](@ref SentinelValues) to @ref WGPUTextureAspect_All.
+     *
+     * The `INIT` macro sets this to @ref WGPUTextureAspect_Undefined.
+     */
+    WGPUTextureAspect aspect;
+    /**
+     * The `INIT` macro sets this to @ref WGPUTextureUsage_None.
+     */
+    WGPUTextureUsage usage;
+} WGPUTextureViewDescriptor WGPU_STRUCTURE_ATTRIBUTE;
+
+/**
+ * Initializer for @ref WGPUTextureViewDescriptor.
+ */
+#define WGPU_TEXTURE_VIEW_DESCRIPTOR_INIT _wgpu_MAKE_INIT_STRUCT(WGPUTextureViewDescriptor, { \
+    /*.nextInChain=*/NULL _wgpu_COMMA \
+    /*.label=*/WGPU_STRING_VIEW_INIT _wgpu_COMMA \
+    /*.format=*/WGPUTextureFormat_Undefined _wgpu_COMMA \
+    /*.dimension=*/WGPUTextureViewDimension_Undefined _wgpu_COMMA \
+    /*.baseMipLevel=*/0 _wgpu_COMMA \
+    /*.mipLevelCount=*/WGPU_MIP_LEVEL_COUNT_UNDEFINED _wgpu_COMMA \
+    /*.baseArrayLayer=*/0 _wgpu_COMMA \
+    /*.arrayLayerCount=*/WGPU_ARRAY_LAYER_COUNT_UNDEFINED _wgpu_COMMA \
+    /*.aspect=*/WGPUTextureAspect_Undefined _wgpu_COMMA \
+    /*.usage=*/WGPUTextureUsage_None _wgpu_COMMA \
+})
+
 /**
  * Default values can be set using @ref WGPU_VERTEX_STATE_INIT as initializer.
  */

webgpu.json

@@ -3320,7 +3320,7 @@ structs:
       TODO
     type: extension
     extends:
-      - struct.texture_view_descriptor
+      - texture_view_descriptor
     members:
       - name: swizzle
         doc: |