Drop Descriptor from chained struct names (#309)

webgpu-native · Jul 9, 2024 · 6c05ae5 · 6c05ae5
1 parent effd3c0
commit 6c05ae5
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 40 deletions.
diff --git a/webgpu.h b/webgpu.h
@@ -143,26 +143,26 @@ struct WGPUQueueDescriptor;
 struct WGPURenderBundleDescriptor;
 struct WGPURenderBundleEncoderDescriptor;
 struct WGPURenderPassDepthStencilAttachment;
-struct WGPURenderPassDescriptorMaxDrawCount;
+struct WGPURenderPassMaxDrawCount;
 struct WGPURenderPassTimestampWrites;
 struct WGPURequestAdapterOptions;
 struct WGPUSamplerBindingLayout;
 struct WGPUSamplerDescriptor;
 struct WGPUShaderModuleCompilationHint;
-struct WGPUShaderModuleSPIRVDescriptor;
-struct WGPUShaderModuleWGSLDescriptor;
+struct WGPUShaderModuleSPIRV;
+struct WGPUShaderModuleWGSL;
 struct WGPUStencilFaceState;
 struct WGPUStorageTextureBindingLayout;
 struct WGPUSurfaceCapabilities;
 struct WGPUSurfaceConfiguration;
 struct WGPUSurfaceDescriptor;
-struct WGPUSurfaceDescriptorFromAndroidNativeWindow;
-struct WGPUSurfaceDescriptorFromCanvasHTMLSelector;
-struct WGPUSurfaceDescriptorFromMetalLayer;
-struct WGPUSurfaceDescriptorFromWaylandSurface;
-struct WGPUSurfaceDescriptorFromWindowsHWND;
-struct WGPUSurfaceDescriptorFromXcbWindow;
-struct WGPUSurfaceDescriptorFromXlibWindow;
+struct WGPUSurfaceFromAndroidNativeWindow;
+struct WGPUSurfaceFromCanvasHTMLSelector;
+struct WGPUSurfaceFromMetalLayer;
+struct WGPUSurfaceFromWaylandSurface;
+struct WGPUSurfaceFromWindowsHWND;
+struct WGPUSurfaceFromXcbWindow;
+struct WGPUSurfaceFromXlibWindow;
 struct WGPUSurfaceTexture;
 struct WGPUTextureBindingLayout;
 struct WGPUTextureDataLayout;
@@ -1024,10 +1024,10 @@ typedef struct WGPURenderPassDepthStencilAttachment {
     WGPUBool stencilReadOnly;
 } WGPURenderPassDepthStencilAttachment WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPURenderPassDescriptorMaxDrawCount {
+typedef struct WGPURenderPassMaxDrawCount {
     WGPUChainedStruct chain;
     uint64_t maxDrawCount;
-} WGPURenderPassDescriptorMaxDrawCount WGPU_STRUCTURE_ATTRIBUTE;
+} WGPURenderPassMaxDrawCount WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPURenderPassTimestampWrites {
     WGPUQuerySet querySet;
@@ -1069,16 +1069,16 @@ typedef struct WGPUShaderModuleCompilationHint {
     WGPUPipelineLayout layout;
 } WGPUShaderModuleCompilationHint WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUShaderModuleSPIRVDescriptor {
+typedef struct WGPUShaderModuleSPIRV {
     WGPUChainedStruct chain;
     uint32_t codeSize;
     uint32_t const * code;
-} WGPUShaderModuleSPIRVDescriptor WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUShaderModuleSPIRV WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUShaderModuleWGSLDescriptor {
+typedef struct WGPUShaderModuleWGSL {
     WGPUChainedStruct chain;
     char const * code;
-} WGPUShaderModuleWGSLDescriptor WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUShaderModuleWGSL WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPUStencilFaceState {
     WGPUCompareFunction compare;
@@ -1123,44 +1123,44 @@ typedef struct WGPUSurfaceDescriptor {
     WGPU_NULLABLE char const * label;
 } WGPUSurfaceDescriptor WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromAndroidNativeWindow {
+typedef struct WGPUSurfaceFromAndroidNativeWindow {
     WGPUChainedStruct chain;
     void * window;
-} WGPUSurfaceDescriptorFromAndroidNativeWindow WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromAndroidNativeWindow WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromCanvasHTMLSelector {
+typedef struct WGPUSurfaceFromCanvasHTMLSelector {
     WGPUChainedStruct chain;
     char const * selector;
-} WGPUSurfaceDescriptorFromCanvasHTMLSelector WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromCanvasHTMLSelector WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromMetalLayer {
+typedef struct WGPUSurfaceFromMetalLayer {
     WGPUChainedStruct chain;
     void * layer;
-} WGPUSurfaceDescriptorFromMetalLayer WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromMetalLayer WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromWaylandSurface {
+typedef struct WGPUSurfaceFromWaylandSurface {
     WGPUChainedStruct chain;
     void * display;
     void * surface;
-} WGPUSurfaceDescriptorFromWaylandSurface WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromWaylandSurface WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromWindowsHWND {
+typedef struct WGPUSurfaceFromWindowsHWND {
     WGPUChainedStruct chain;
     void * hinstance;
     void * hwnd;
-} WGPUSurfaceDescriptorFromWindowsHWND WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromWindowsHWND WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromXcbWindow {
+typedef struct WGPUSurfaceFromXcbWindow {
     WGPUChainedStruct chain;
     void * connection;
     uint32_t window;
-} WGPUSurfaceDescriptorFromXcbWindow WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromXcbWindow WGPU_STRUCTURE_ATTRIBUTE;
 
-typedef struct WGPUSurfaceDescriptorFromXlibWindow {
+typedef struct WGPUSurfaceFromXlibWindow {
     WGPUChainedStruct chain;
     void * display;
     uint64_t window;
-} WGPUSurfaceDescriptorFromXlibWindow WGPU_STRUCTURE_ATTRIBUTE;
+} WGPUSurfaceFromXlibWindow WGPU_STRUCTURE_ATTRIBUTE;
 
 typedef struct WGPUSurfaceTexture {
     WGPUTexture texture;

diff --git a/webgpu.yml b/webgpu.yml
@@ -2315,7 +2315,7 @@ structs:
         type: struct.render_pass_timestamp_writes
         pointer: immutable
         optional: true
-  - name: render_pass_descriptor_max_draw_count
+  - name: render_pass_max_draw_count
     doc: |
       TODO
     type: extension_in
@@ -2500,7 +2500,7 @@ structs:
           TODO
         type: array<struct.shader_module_compilation_hint>
         pointer: immutable
-  - name: shader_module_SPIRV_descriptor
+  - name: shader_module_SPIRV
     doc: |
       TODO
     type: extension_in
@@ -2516,7 +2516,7 @@ structs:
           TODO
         type: uint32
         pointer: immutable
-  - name: shader_module_WGSL_descriptor
+  - name: shader_module_WGSL
     doc: |
       TODO
     type: extension_in
@@ -2647,7 +2647,7 @@ structs:
           TODO
         type: string
         optional: true
-  - name: surface_descriptor_from_android_native_window
+  - name: surface_from_android_native_window
     doc: |
       TODO
     type: extension_in
@@ -2659,7 +2659,7 @@ structs:
           TODO
         type: c_void
         pointer: mutable
-  - name: surface_descriptor_from_canvas_HTML_selector
+  - name: surface_from_canvas_HTML_selector
     doc: |
       TODO
     type: extension_in
@@ -2670,7 +2670,7 @@ structs:
         doc: |
           TODO
         type: string
-  - name: surface_descriptor_from_metal_layer
+  - name: surface_from_metal_layer
     doc: |
       TODO
     type: extension_in
@@ -2682,7 +2682,7 @@ structs:
           TODO
         type: c_void
         pointer: mutable
-  - name: surface_descriptor_from_wayland_surface
+  - name: surface_from_wayland_surface
     doc: |
       TODO
     type: extension_in
@@ -2699,7 +2699,7 @@ structs:
           TODO
         type: c_void
         pointer: mutable
-  - name: surface_descriptor_from_windows_HWND
+  - name: surface_from_windows_HWND
     doc: |
       TODO
     type: extension_in
@@ -2716,7 +2716,7 @@ structs:
           TODO
         type: c_void
         pointer: mutable
-  - name: surface_descriptor_from_xcb_window
+  - name: surface_from_xcb_window
     doc: |
       TODO
     type: extension_in
@@ -2732,7 +2732,7 @@ structs:
         doc: |
           TODO
         type: uint32
-  - name: surface_descriptor_from_xlib_window
+  - name: surface_from_xlib_window
     doc: |
       TODO
     type: extension_in