zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu: implement RenderBundleEncoder.finish

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-03-16 21:09:51 -07:00 • committed by Stephen Gutekanst
parent 9e7f0796f6
commit d7476bc24e
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gpu/src/NativeInstance.zig
View file

@ -1164,6 +1164,15 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{
); );
} }
}).drawIndirect, }).drawIndirect,
.finish = (struct {
pub fn finish(ptr: *anyopaque, descriptor: *const RenderBundle.Descriptor) RenderBundle {
const desc = c.WGPURenderBundleDescriptor{
.nextInChain = null,
.label = if (descriptor.label) |l| l else null,
};
return wrapRenderBundle(c.wgpuRenderBundleEncoderFinish(@ptrCast(c.WGPURenderBundleEncoder, ptr), &desc));
}
}).finish,
// .beginOcclusionQuery = (struct { // .beginOcclusionQuery = (struct {
// pub fn beginOcclusionQuery(ptr: *anyopaque, query_index: u32) void { // pub fn beginOcclusionQuery(ptr: *anyopaque, query_index: u32) void {
// c.wgpuRenderBundleEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr), query_index); // c.wgpuRenderBundleEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr), query_index);
@ -1174,11 +1183,6 @@ const render_bundle_encoder_vtable = RenderBundleEncoder.VTable{
// c.wgpuRenderBundleEncoderEndOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr)); // c.wgpuRenderBundleEncoderEndOcclusionQuery(@ptrCast(c.WGPURenderBundleEncoder, ptr));
// } // }
// }).endOcclusionQuery, // }).endOcclusionQuery,
// .end = (struct {
// pub fn end(ptr: *anyopaque) void {
// c.wgpuRenderBundleEncoderEnd(@ptrCast(c.WGPURenderBundleEncoder, ptr));
// }
// }).end,
// .executeBundles = (struct { // .executeBundles = (struct {
// pub fn executeBundles(ptr: *anyopaque, bundles: []RenderBundle) void { // pub fn executeBundles(ptr: *anyopaque, bundles: []RenderBundle) void {
// var few_bundles: [16]c.WGPURenderBundle = undefined; // var few_bundles: [16]c.WGPURenderBundle = undefined;

13
gpu/src/RenderBundleEncoder.zig
View file

@ -1,5 +1,6 @@
const Texture = @import("Texture.zig"); const Texture = @import("Texture.zig");
const Buffer = @import("Buffer.zig"); const Buffer = @import("Buffer.zig");
const RenderBundle = @import("RenderBundle.zig");
const RenderBundleEncoder = @This(); const RenderBundleEncoder = @This();
@ -28,8 +29,7 @@ pub const VTable = struct {
) void, ) void,
drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void, drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
drawIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void, drawIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
// finish: fn (ptr: *anyopaque, descriptor: *const RenderBundle.Descriptor) void, finish: fn (ptr: *anyopaque, descriptor: *const RenderBundle.Descriptor) RenderBundle,
// WGPU_EXPORT WGPURenderBundle wgpuRenderBundleEncoderFinish(WGPURenderBundleEncoder renderBundleEncoder, WGPURenderBundleDescriptor const * descriptor);
// insertDebugMarker: fn (ptr: *anyopaque, marker_label: [*:0]const u8) void, // insertDebugMarker: fn (ptr: *anyopaque, marker_label: [*:0]const u8) void,
// WGPU_EXPORT void wgpuRenderBundleEncoderInsertDebugMarker(WGPURenderBundleEncoder renderBundleEncoder, char const * markerLabel); // WGPU_EXPORT void wgpuRenderBundleEncoderInsertDebugMarker(WGPURenderBundleEncoder renderBundleEncoder, char const * markerLabel);
// popDebugGroup: fn (ptr: *anyopaque) void, // popDebugGroup: fn (ptr: *anyopaque) void,
@ -84,6 +84,10 @@ pub inline fn drawIndirect(enc: RenderBundleEncoder, indirect_buffer: Buffer, in
enc.vtable.drawIndirect(enc.ptr, indirect_buffer, indirect_offset); enc.vtable.drawIndirect(enc.ptr, indirect_buffer, indirect_offset);
} }
pub inline fn finish(enc: RenderBundleEncoder, descriptor: *const RenderBundle.Descriptor) RenderBundle {
return enc.vtable.finish(enc.ptr, descriptor);
}
// pub inline fn beginOcclusionQuery(enc: RenderBundleEncoder, query_index: u32) void { // pub inline fn beginOcclusionQuery(enc: RenderBundleEncoder, query_index: u32) void {
// enc.vtable.beginOcclusionQuery(enc.ptr, query_index); // enc.vtable.beginOcclusionQuery(enc.ptr, query_index);
// } // }
@ -92,10 +96,6 @@ pub inline fn drawIndirect(enc: RenderBundleEncoder, indirect_buffer: Buffer, in
// enc.vtable.endOcclusionQuery(enc.ptr); // enc.vtable.endOcclusionQuery(enc.ptr);
// } // }
// pub inline fn end(enc: RenderBundleEncoder) void {
// enc.vtable.end(enc.ptr);
// }
// pub inline fn executeBundles(enc: RenderBundleEncoder, bundles: []RenderBundle) void { // pub inline fn executeBundles(enc: RenderBundleEncoder, bundles: []RenderBundle) void {
// enc.vtable.executeBundles(enc.ptr, bundles); // enc.vtable.executeBundles(enc.ptr, bundles);
// } // }
@ -194,5 +194,6 @@ test {
_ = drawIndexed; _ = drawIndexed;
_ = drawIndexedIndirect; _ = drawIndexedIndirect;
_ = drawIndirect; _ = drawIndirect;
_ = finish;
_ = Descriptor; _ = Descriptor;
} }