diff --git a/gpu/src/interface.zig b/gpu/src/interface.zig index 3cc3a622..bf61b561 100644 --- a/gpu/src/interface.zig +++ b/gpu/src/interface.zig @@ -144,7 +144,7 @@ pub fn Interface(comptime T: type) type { assertDecl(T, "renderBundleEncoderDrawIndexed", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, index_count: u32, instance_count: u32, first_index: u32, base_vertex: u32, first_instance: u32) callconv(.Inline) void); assertDecl(T, "renderBundleEncoderDrawIndexedIndirect", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, indirect_buffer: *gpu.Buffer, indirect_offset: u64) callconv(.Inline) void); assertDecl(T, "renderBundleEncoderDrawIndirect", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, indirect_buffer: *gpu.Buffer, indirect_offset: u64) callconv(.Inline) void); - assertDecl(T, "renderBundleEncoderFinish", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundleDescriptor) callconv(.Inline) void); + assertDecl(T, "renderBundleEncoderFinish", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) callconv(.Inline) void); assertDecl(T, "renderBundleEncoderInsertDebugMarker", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, marker_label: [*:0]const u8) callconv(.Inline) void); assertDecl(T, "renderBundleEncoderPopDebugGroup", fn (render_bundle_encoder: *gpu.RenderBundleEncoder) callconv(.Inline) void); assertDecl(T, "renderBundleEncoderPushDebugGroup", fn (render_bundle_encoder: *gpu.RenderBundleEncoder, group_label: [*:0]const u8) callconv(.Inline) void); @@ -874,7 +874,7 @@ pub fn Export(comptime T: type) type { } // WGPU_EXPORT WGPURenderBundle wgpuRenderBundleEncoderFinish(WGPURenderBundleEncoder renderBundleEncoder, WGPURenderBundleDescriptor const * descriptor /* nullable */); - export fn wgpuRenderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundleDescriptor) void { + export fn wgpuRenderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) void { T.renderBundleEncoderFinish(render_bundle_encoder, descriptor); } @@ -2016,7 +2016,7 @@ pub const StubInterface = Interface(struct { unreachable; } - pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundleDescriptor) void { + pub inline fn renderBundleEncoderFinish(render_bundle_encoder: *gpu.RenderBundleEncoder, descriptor: ?*const gpu.RenderBundle.Descriptor) void { _ = render_bundle_encoder; _ = descriptor; unreachable; diff --git a/gpu/src/render_bundle.zig b/gpu/src/render_bundle.zig index d316fb9d..f72b4593 100644 --- a/gpu/src/render_bundle.zig +++ b/gpu/src/render_bundle.zig @@ -2,6 +2,11 @@ const ChainedStruct = @import("types.zig").ChainedStruct; const Impl = @import("interface.zig").Impl; pub const RenderBundle = opaque { + pub const Descriptor = extern struct { + next_in_chain: ?*const ChainedStruct = null, + label: ?[*:0]const u8 = null, + }; + pub inline fn reference(render_bundle: *RenderBundle) void { Impl.renderBundleReference(render_bundle); } @@ -10,8 +15,3 @@ pub const RenderBundle = opaque { Impl.renderBundleRelease(render_bundle); } }; - -pub const RenderBundleDescriptor = extern struct { - next_in_chain: ?*const ChainedStruct = null, - label: ?[*:0]const u8 = null, -}; diff --git a/gpu/src/render_bundle_encoder.zig b/gpu/src/render_bundle_encoder.zig index 1cf8b344..242b05cc 100644 --- a/gpu/src/render_bundle_encoder.zig +++ b/gpu/src/render_bundle_encoder.zig @@ -1,9 +1,9 @@ const Texture = @import("texture.zig").Texture; const TextureFormat = @import("texture.zig").TextureFormat; const Buffer = @import("buffer.zig").Buffer; -const RenderBundleDescriptor = @import("render_bundle.zig").RenderBundleDescriptor; const BindGroup = @import("bind_group.zig").BindGroup; const RenderPipeline = @import("render_pipeline.zig").RenderPipeline; +const RenderBundle = @import("render_bundle.zig").RenderBundle; const ChainedStruct = @import("types.zig").ChainedStruct; const IndexFormat = @import("types.zig").IndexFormat; const Impl = @import("interface.zig").Impl; @@ -44,7 +44,7 @@ pub const RenderBundleEncoder = opaque { Impl.renderBundleEncoderDrawIndirect(render_bundle_encoder, indirect_buffer, indirect_offset); } - pub inline fn finish(render_bundle_encoder: *RenderBundleEncoder, descriptor: ?*const RenderBundleDescriptor) void { + pub inline fn finish(render_bundle_encoder: *RenderBundleEncoder, descriptor: ?*const RenderBundle.Descriptor) void { Impl.renderBundleEncoderFinish(render_bundle_encoder, descriptor); }